Chromium Code Reviews| Index: src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
| diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
| index d31482a4bb9a708ef151bff2884d8c3e8c455139..961212d2a05db737a34c3e5ad6fab56d0c45175d 100644 |
| --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
| +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp |
| @@ -8,7 +8,7 @@ |
| #include "GrGLFragmentShaderBuilder.h" |
| #include "GrGLProgramBuilder.h" |
| #include "gl/GrGLGpu.h" |
| -#include "gl/GrGLGLSL.h" |
| +#include "glsl/GrGLSL.h" |
| #include "glsl/GrGLSLCaps.h" |
| #define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X) |
| @@ -269,9 +269,9 @@ bool GrGLFragmentShaderBuilder::compileAndAttachShaders(GrGLuint programId, |
| SkTDArray<GrGLuint>* shaderIds) { |
| GrGLGpu* gpu = fProgramBuilder->gpu(); |
|
jvanverth1
2015/10/23 20:39:21
(from the dry run) This variable is no longer used
|
| this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString(); |
| - GrGLAppendGLSLDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision, |
| - gpu->glStandard(), |
| - &this->precisionQualifier()); |
| + GrGLSLAppendDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision, |
| + *fProgramBuilder->glslCaps(), |
| + &this->precisionQualifier()); |
| this->compileAndAppendLayoutQualifiers(); |
| fProgramBuilder->appendUniformDecls(GrGLProgramBuilder::kFragment_Visibility, |
| &this->uniforms()); |