diff options
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 11 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 04d169d4d9..7d0ce74abe 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -54,15 +54,6 @@ public: return this->uniformHandler()->texelBufferVariable(handle); } - // Handles for program uniforms (other than per-effect uniforms) - struct BuiltinUniformHandles { - UniformHandle fRTAdjustmentUni; - - // We use the render target height to provide a y-down frag coord when specifying - // origin_upper_left is not supported. - UniformHandle fRTHeightUni; - }; - // Used to add a uniform for the RenderTarget height (used for frag position) without mangling // the name of the uniform inside of a stage. void addRTHeightUniform(const char* name); @@ -94,7 +85,7 @@ public: const GrPrimitiveProcessor& fPrimProc; GrProgramDesc* fDesc; - BuiltinUniformHandles fUniformHandles; + GrGLSLBuiltinUniformHandles fUniformHandles; std::unique_ptr<GrGLSLPrimitiveProcessor> fGeometryProcessor; std::unique_ptr<GrGLSLXferProcessor> fXferProcessor; diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index 662486eebe..fe89b882b6 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -17,6 +17,14 @@ class GrGLSLProgramBuilder; +// Handles for program uniforms (other than per-effect uniforms) +struct GrGLSLBuiltinUniformHandles { + GrGLSLProgramDataManager::UniformHandle fRTAdjustmentUni; + // We use the render target height to provide a y-down frag coord when specifying + // origin_upper_left is not supported. + GrGLSLProgramDataManager::UniformHandle fRTHeightUni; +}; + class GrGLSLUniformHandler { public: virtual ~GrGLSLUniformHandler() {} |