Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/gl/GrGLProgram.cpp

Issue 674543004: OptState owns program descriptor (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/gpu/GrProgramDesc.h ('K') | « src/gpu/gl/GrGLProgram.h ('k') | src/gpu/gl/GrGLProgramDesc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLProgram.cpp
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 2d9b569333a03c7ac11f13c9f8606074b9dcc677..ccd6d117a2765504911d7ad5c16d7962b74fb807 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,
@@ -204,11 +204,10 @@ void GrGLProgram::didSetData(GrGpu::DrawType drawType) {
void GrGLProgram::setColor(const GrOptDrawState& optState,
GrColor color,
SharedGLState* sharedState) {
- const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader();
- if (!optState.hasColorVertexAttribute()) {
+ const GrProgramDesc::KeyHeader& header = fDesc.header();
+ if (-1 != header.fColorAttributeIndex) {
switch (header.fColorInput) {
- case GrGLProgramDesc::kAttribute_ColorInput:
- SkASSERT(-1 != header.fColorAttributeIndex);
+ case GrProgramDesc::kAttribute_ColorInput:
if (sharedState->fConstAttribColor != color ||
sharedState->fConstAttribColorIndex != header.fColorAttributeIndex) {
// OpenGL ES only supports the float varieties of glVertexAttrib
@@ -219,7 +218,7 @@ void GrGLProgram::setColor(const GrOptDrawState& optState,
sharedState->fConstAttribColorIndex = header.fColorAttributeIndex;
}
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];
@@ -229,7 +228,7 @@ void GrGLProgram::setColor(const GrOptDrawState& optState,
}
sharedState->fConstAttribColorIndex = -1;
break;
- case GrGLProgramDesc::kAllOnes_ColorInput:
+ case GrProgramDesc::kAllOnes_ColorInput:
sharedState->fConstAttribColorIndex = -1;
break;
default:
@@ -243,10 +242,10 @@ void GrGLProgram::setColor(const GrOptDrawState& optState,
void GrGLProgram::setCoverage(const GrOptDrawState& optState,
GrColor coverage,
SharedGLState* sharedState) {
- const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader();
- if (!optState.hasCoverageVertexAttribute()) {
+ const GrProgramDesc::KeyHeader& header = fDesc.header();
+ if (-1 != header.fCoverageAttributeIndex) {
switch (header.fCoverageInput) {
- case GrGLProgramDesc::kAttribute_ColorInput:
+ case GrProgramDesc::kAttribute_ColorInput:
if (sharedState->fConstAttribCoverage != coverage ||
sharedState->fConstAttribCoverageIndex != header.fCoverageAttributeIndex) {
// OpenGL ES only supports the float varieties of glVertexAttrib
@@ -257,7 +256,7 @@ void GrGLProgram::setCoverage(const GrOptDrawState& optState,
sharedState->fConstAttribCoverageIndex = header.fCoverageAttributeIndex;
}
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];
@@ -267,7 +266,7 @@ void GrGLProgram::setCoverage(const GrOptDrawState& optState,
}
sharedState->fConstAttribCoverageIndex = -1;
break;
- case GrGLProgramDesc::kAllOnes_ColorInput:
+ case GrProgramDesc::kAllOnes_ColorInput:
sharedState->fConstAttribCoverageIndex = -1;
break;
default:
@@ -318,7 +317,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,
@@ -338,7 +337,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,
@@ -387,7 +386,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,
« src/gpu/GrProgramDesc.h ('K') | « src/gpu/gl/GrGLProgram.h ('k') | src/gpu/gl/GrGLProgramDesc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698