From 5e550ab57e0204bfadd2cb69c47d2a85e38d6a4c Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Tue, 2 May 2017 21:07:25 +0000 Subject: Revert "eliminated GrGLSLExpr" This reverts commit 93f20f5629e52eed732d2b9d6dbbb351cc30b2cd. Reason for revert: Mismerge readded deleted files. Original change's description: > 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 > TBR=bsalomon@google.com,ethannicholas@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia8b723594527afe34489fc78a4b49039081b6390 Reviewed-on: https://skia-review.googlesource.com/15154 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/gl/builders/GrGLProgramBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gpu/gl/builders') diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 03518194bc..9ddfa80baf 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -40,7 +40,12 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, // uniforms, varyings, textures, etc GrGLProgramBuilder builder(gpu, pipeline, primProc, desc); - if (!builder.emitAndInstallProcs()) { + // 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)) { builder.cleanupFragmentProcessors(); return nullptr; } -- cgit v1.2.3