diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-28 17:59:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-28 17:59:26 -0700 |
| commit | 79f8faeea2692d2948c0f634e956d1e7fc8333e0 (patch) | |
| tree | a4de457cd96b8b8ada35fa277e79fd7fb47f2e4b /src/gpu/gl/GrGLProgram.cpp | |
| parent | 7a5693178414e133426f99b45d703ee2b0078af4 (diff) | |
OptState owns program descriptor
BUG=skia:
Review URL: https://codereview.chromium.org/674543004
Diffstat (limited to 'src/gpu/gl/GrGLProgram.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index bfa5f3cbc1..f152173e99 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -56,7 +56,7 @@ static SkMatrix get_transform_matrix(const GrFragmentStage& processorStage, /////////////////////////////////////////////////////////////////////////////////////////////////// GrGLProgram::GrGLProgram(GrGpuGL* gpu, - const GrGLProgramDesc& desc, + const GrProgramDesc& desc, const BuiltinUniformHandles& builtinUniforms, GrGLuint programID, const UniformInfoArray& uniforms, @@ -201,12 +201,12 @@ void GrGLProgram::didSetData(GrGpu::DrawType drawType) { } void GrGLProgram::setColor(const GrOptDrawState& optState, GrColor color) { - const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader(); + const GrProgramDesc::KeyHeader& header = fDesc.header(); switch (header.fColorInput) { - case GrGLProgramDesc::kAttribute_ColorInput: + case GrProgramDesc::kAttribute_ColorInput: // Attribute case is handled in GrGpuGL::setupGeometry break; - case GrGLProgramDesc::kUniform_ColorInput: + case GrProgramDesc::kUniform_ColorInput: if (fColor != color && fBuiltinUniformHandles.fColorUni.isValid()) { // OpenGL ES doesn't support unsigned byte varieties of glUniform GrGLfloat c[4]; @@ -215,7 +215,7 @@ void GrGLProgram::setColor(const GrOptDrawState& optState, GrColor color) { fColor = color; } break; - case GrGLProgramDesc::kAllOnes_ColorInput: + case GrProgramDesc::kAllOnes_ColorInput: // Handled by shader creation break; default: @@ -224,12 +224,12 @@ void GrGLProgram::setColor(const GrOptDrawState& optState, GrColor color) { } void GrGLProgram::setCoverage(const GrOptDrawState& optState, GrColor coverage) { - const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader(); + const GrProgramDesc::KeyHeader& header = fDesc.header(); switch (header.fCoverageInput) { - case GrGLProgramDesc::kAttribute_ColorInput: + case GrProgramDesc::kAttribute_ColorInput: // Attribute case is handled in GrGpuGL::setupGeometry break; - case GrGLProgramDesc::kUniform_ColorInput: + case GrProgramDesc::kUniform_ColorInput: if (fCoverage != coverage) { // OpenGL ES doesn't support unsigned byte varieties of glUniform GrGLfloat c[4]; @@ -238,7 +238,7 @@ void GrGLProgram::setCoverage(const GrOptDrawState& optState, GrColor coverage) fCoverage = coverage; } break; - case GrGLProgramDesc::kAllOnes_ColorInput: + case GrProgramDesc::kAllOnes_ColorInput: // Handled by shader creation break; default: @@ -286,7 +286,7 @@ void GrGLProgram::onSetMatrixAndRenderTargetHeight(GrGpu::DrawType drawType, ///////////////////////////////////////////////////////////////////////////////////////// GrGLNvprProgramBase::GrGLNvprProgramBase(GrGpuGL* gpu, - const GrGLProgramDesc& desc, + const GrProgramDesc& desc, const BuiltinUniformHandles& builtinUniforms, GrGLuint programID, const UniformInfoArray& uniforms, @@ -306,7 +306,7 @@ void GrGLNvprProgramBase::onSetMatrixAndRenderTargetHeight(GrGpu::DrawType drawT ///////////////////////////////////////////////////////////////////////////////////////// GrGLNvprProgram::GrGLNvprProgram(GrGpuGL* gpu, - const GrGLProgramDesc& desc, + const GrProgramDesc& desc, const BuiltinUniformHandles& builtinUniforms, GrGLuint programID, const UniformInfoArray& uniforms, @@ -355,7 +355,7 @@ void GrGLNvprProgram::setTransformData(const GrFragmentStage& proc, GrGLInstalle ////////////////////////////////////////////////////////////////////////////////////// GrGLLegacyNvprProgram::GrGLLegacyNvprProgram(GrGpuGL* gpu, - const GrGLProgramDesc& desc, + const GrProgramDesc& desc, const BuiltinUniformHandles& builtinUniforms, GrGLuint programID, const UniformInfoArray& uniforms, |