diff options
author | 2016-07-30 14:21:10 -0700 | |
---|---|---|
committer | 2016-07-30 14:21:10 -0700 | |
commit | 02aed95f9c7c6745c02e9aa8604d27d7a3ae93db (patch) | |
tree | bf573a00bea3456ce3fcc43c052aa9ae107b60fe /src/core/SkNormalSourcePriv.h | |
parent | 7c0db75f40f588d91884dfbf3c207d040f3d802d (diff) |
Revert of GrFP can express distance vector field req., program builder declares variable for it (patchset #20 id:370001 of https://codereview.chromium.org/2114993002/ )
Reason for revert:
UBSAN says we're reading a bad bool here:
bool usesDistanceVectorField() const { return fUsesDistanceVectorField; }
../../../include/gpu/GrPaint.h:83:51: runtime error: load of value 239, which is not a valid value for type 'bool'
SUMMARY: AddressSanitizer: undefined-behavior ../../../include/gpu/GrPaint.h:83:51 in
Seems likely also the root of Valgrind failure:
https://luci-milo.appspot.com/swarming/task/30522e4f2241cb10
Original issue's description:
> GrFP can express distance vector field req., program builder declares variable for it
>
> This update allows fragment processors to require a field of vectors to the nearest edge. This requirement propagates:
>
> - from child FPs to their parent
> - from parent FPs to the GrPaint
> - from GrPaint through the PipelineBuilder into GrPipeline
> - acessed from GrPipeline by GrGLSLProgramBuilder
>
> GrGLSL generates a variable for the distance vector and passes it down to the GeometryProcessor->emitCode() method.
>
> This CL's base is the CL for adding the BevelNormalSource API: https://codereview.chromium.org/2080993002
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2114993002
>
> Committed: https://skia.googlesource.com/skia/+/4ef6dfa7089c092c67b0d5ec34e89c1e319af196
TBR=egdaniel@google.com,robertphillips@google.com,bsalomon@google.com,dvonbeck@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review-Url: https://codereview.chromium.org/2201613002
Diffstat (limited to 'src/core/SkNormalSourcePriv.h')
-rw-r--r-- | src/core/SkNormalSourcePriv.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/src/core/SkNormalSourcePriv.h b/src/core/SkNormalSourcePriv.h deleted file mode 100644 index ce8baf61e4..0000000000 --- a/src/core/SkNormalSourcePriv.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkNormalSourcePriv_DEFINED -#define SkNormalSourcePriv_DEFINED - -#if SK_SUPPORT_GPU -#include "glsl/GrGLSLFragmentProcessor.h" -#include "glsl/GrGLSLFragmentShaderBuilder.h" - -/* GLSLFragmentProcessors for NormalSourceImpls must sub-class this class and override onEmitCode, - * and setNormalData calls, as well as all other calls FPs normally override, except for the 2 - * defined in this superclass. - * This class exists to intercept emitCode calls and emit <0, 0, 1> if the FP requires a distance - * vector but the GP doesn't provide it. onSetData calls need to be intercepted too because - * uniform handlers will be invalid in subclasses where onEmitCode isn't called. - * We don't need to adjust the key here since the use of a given GP (through its class ID already in - * the key), will determine what code gets emitted here. - */ -class GLSLNormalFP : public GrGLSLFragmentProcessor { -public: - GLSLNormalFP() - : fDidIntercept(false) {} - - void emitCode(EmitArgs& args) final override { - if (args.fFp.usesDistanceVectorField() && !args.fGpImplementsDistanceVector) { - GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; - fragBuilder->codeAppendf("// GLSLNormalFP intercepted emitCode call, GP does not " - "implement required distance vector feature\n"); - fragBuilder->codeAppendf("%s = vec4(0, 0, 1, 0);", args.fOutputColor); - - fDidIntercept = true; - } else { - this->onEmitCode(args); - } - } - - void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) final override { - if (!fDidIntercept) { - this->setNormalData(pdman, proc); - } - } - -protected: - virtual void onEmitCode(EmitArgs& args) = 0; - virtual void setNormalData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) = 0; - -private: - bool fDidIntercept; -}; -#endif - -#endif |