From 5366a09ed07e886dd5fd1b94828241c53df3726d Mon Sep 17 00:00:00 2001 From: ethannicholas Date: Fri, 22 Jan 2016 09:45:47 -0800 Subject: Revert of added support for PLS path rendering (patchset #16 id:360001 of https://codereview.chromium.org/1541903002/ ) Reason for revert: ASAN failure at src/gpu/GrXferProcessor.cpp:224 Original issue's description: > added support for PLS path rendering > > BUG=skia:3555 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1541903002 > > Committed: https://skia.googlesource.com/skia/+/7df3f5e127f8016d17b637cc48a6a4718f1a6822 TBR=bsalomon@google.com,egdaniel@google.com,joshualitt@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3555 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1626553002 Review URL: https://codereview.chromium.org/1626553002 --- src/gpu/glsl/GrGLSLXferProcessor.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/gpu/glsl/GrGLSLXferProcessor.h') diff --git a/src/gpu/glsl/GrGLSLXferProcessor.h b/src/gpu/glsl/GrGLSLXferProcessor.h index 1a997a5f4d..ed8099b6f3 100644 --- a/src/gpu/glsl/GrGLSLXferProcessor.h +++ b/src/gpu/glsl/GrGLSLXferProcessor.h @@ -32,8 +32,7 @@ public: const char* inputCoverage, const char* outputPrimary, const char* outputSecondary, - const TextureSamplerArray& samplers, - const bool usePLSDstRead) + const TextureSamplerArray& samplers) : fXPFragBuilder(fragBuilder) , fUniformHandler(uniformHandler) , fGLSLCaps(caps) @@ -42,8 +41,7 @@ public: , fInputCoverage(inputCoverage) , fOutputPrimary(outputPrimary) , fOutputSecondary(outputSecondary) - , fSamplers(samplers) - , fUsePLSDstRead(usePLSDstRead) {} + , fSamplers(samplers) {} GrGLSLXPFragmentBuilder* fXPFragBuilder; GrGLSLUniformHandler* fUniformHandler; @@ -54,7 +52,6 @@ public: const char* fOutputPrimary; const char* fOutputSecondary; const TextureSamplerArray& fSamplers; - bool fUsePLSDstRead; }; /** * This is similar to emitCode() in the base class, except it takes a full shader builder. -- cgit v1.2.3