diff options
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r-- | src/gpu/glsl/GrGLSLShaderVar.h | 8 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLVarying.cpp | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/gpu/glsl/GrGLSLShaderVar.h b/src/gpu/glsl/GrGLSLShaderVar.h index 35ac4bcb84..74afed8cda 100644 --- a/src/gpu/glsl/GrGLSLShaderVar.h +++ b/src/gpu/glsl/GrGLSLShaderVar.h @@ -216,21 +216,17 @@ private: switch (t) { case kNone_TypeModifier: return ""; - case kAttribute_TypeModifier: // fall through - case kVaryingIn_TypeModifier: // fall through case kIn_TypeModifier: return "in"; case kInOut_TypeModifier: return "inout"; - case kVaryingOut_TypeModifier: // fall through case kOut_TypeModifier: return "out"; case kUniform_TypeModifier: return "uniform"; - default: - SkFAIL("Unknown shader variable type modifier."); - return ""; // suppress warning } + SkFAIL("Unknown shader variable type modifier."); + return ""; // suppress warning } /// Work around driver bugs on some hardware that don't correctly diff --git a/src/gpu/glsl/GrGLSLVarying.cpp b/src/gpu/glsl/GrGLSLVarying.cpp index f3b0405ff5..4d9b61fd86 100644 --- a/src/gpu/glsl/GrGLSLVarying.cpp +++ b/src/gpu/glsl/GrGLSLVarying.cpp @@ -72,14 +72,14 @@ void GrGLSLVaryingHandler::emitAttributes(const GrGeometryProcessor& gp) { const GrGeometryProcessor::Attribute& attr = gp.getAttrib(i); this->addAttribute(GrShaderVar(attr.fName, GrVertexAttribTypeToSLType(attr.fType), - GrShaderVar::kAttribute_TypeModifier, + GrShaderVar::kIn_TypeModifier, GrShaderVar::kNonArray, attr.fPrecision)); } } void GrGLSLVaryingHandler::addAttribute(const GrShaderVar& var) { - SkASSERT(GrShaderVar::kAttribute_TypeModifier == var.getTypeModifier()); + SkASSERT(GrShaderVar::kIn_TypeModifier == var.getTypeModifier()); for (int j = 0; j < fVertexInputs.count(); ++j) { const GrGLSLShaderVar& attr = fVertexInputs[j]; // if attribute already added, don't add it again @@ -111,10 +111,10 @@ void GrGLSLVaryingHandler::finalize() { const VaryingInfo& v = this->fVaryings[i]; const char* modifier = v.fIsFlat ? "flat" : fDefaultInterpolationModifier; if (v.fVisibility & kVertex_GrShaderFlag) { - fVertexOutputs.push_back().set(v.fType, GrShaderVar::kVaryingOut_TypeModifier, v.fVsOut, + fVertexOutputs.push_back().set(v.fType, GrShaderVar::kOut_TypeModifier, v.fVsOut, v.fPrecision, nullptr, modifier); if (v.fVisibility & kGeometry_GrShaderFlag) { - fGeomInputs.push_back().set(v.fType, GrShaderVar::kVaryingIn_TypeModifier, v.fVsOut, + fGeomInputs.push_back().set(v.fType, GrShaderVar::kIn_TypeModifier, v.fVsOut, GrShaderVar::kUnsizedArray, v.fPrecision, nullptr, modifier); } @@ -122,11 +122,11 @@ void GrGLSLVaryingHandler::finalize() { if (v.fVisibility & kFragment_GrShaderFlag) { const char* fsIn = v.fVsOut.c_str(); if (v.fVisibility & kGeometry_GrShaderFlag) { - fGeomOutputs.push_back().set(v.fType, GrGLSLShaderVar::kVaryingOut_TypeModifier, + fGeomOutputs.push_back().set(v.fType, GrGLSLShaderVar::kOut_TypeModifier, v.fGsOut, v.fPrecision, nullptr, modifier); fsIn = v.fGsOut.c_str(); } - fFragInputs.push_back().set(v.fType, GrShaderVar::kVaryingIn_TypeModifier, fsIn, + fFragInputs.push_back().set(v.fType, GrShaderVar::kIn_TypeModifier, fsIn, v.fPrecision, nullptr, modifier); } } |