From 93f20f5629e52eed732d2b9d6dbbb351cc30b2cd Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 2 May 2017 15:37:57 -0400 Subject: eliminated GrGLSLExpr Now that skslc performs all of the optimizations (and then some) that GrGLSLExpr is responsible for, it's just extra work for no benefit. Bug: skia: Change-Id: I40b0629e00a33873ed9fc6c0a9f41d8350221f9a Reviewed-on: https://skia-review.googlesource.com/14560 Commit-Queue: Ethan Nicholas Reviewed-by: Brian Salomon --- src/gpu/gl/builders/GrGLProgramBuilder.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/gpu/gl/builders') diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 9ddfa80baf..03518194bc 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -40,12 +40,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, // uniforms, varyings, textures, etc GrGLProgramBuilder builder(gpu, pipeline, primProc, desc); - // TODO: Once all stages can handle taking a float or vec4 and correctly handling them we can - // seed correctly here - GrGLSLExpr4 inputColor; - GrGLSLExpr4 inputCoverage; - - if (!builder.emitAndInstallProcs(&inputColor, &inputCoverage)) { + if (!builder.emitAndInstallProcs()) { builder.cleanupFragmentProcessors(); return nullptr; } -- cgit v1.2.3