Index: src/gpu/glsl/GrGLSLShaderVar.h |
diff --git a/src/gpu/glsl/GrGLSLShaderVar.h b/src/gpu/glsl/GrGLSLShaderVar.h |
index 9d162ecaa4b5f05f6808bbf9a7be342f32ff0fd1..35ac4bcb843423d1e9b9836e347909e1d7facf15 100644 |
--- a/src/gpu/glsl/GrGLSLShaderVar.h |
+++ b/src/gpu/glsl/GrGLSLShaderVar.h |
@@ -213,24 +213,20 @@ public: |
private: |
static const char* TypeModifierString(const GrGLSLCaps* glslCaps, TypeModifier t) { |
- GrGLSLGeneration gen = glslCaps->generation(); |
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"; |
- case kAttribute_TypeModifier: |
- return k110_GrGLSLGeneration == gen ? "attribute" : "in"; |
- case kVaryingIn_TypeModifier: |
- return k110_GrGLSLGeneration == gen ? "varying" : "in"; |
- case kVaryingOut_TypeModifier: |
- return k110_GrGLSLGeneration == gen ? "varying" : "out"; |
default: |
SkFAIL("Unknown shader variable type modifier."); |
return ""; // suppress warning |