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

Unified Diff: src/gpu/gl/GrGLShaderVar.h

Issue 14371014: Add non-separable xfer modes to GPU backend. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 8 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
« no previous file with comments | « src/gpu/gl/GrGLShaderBuilder.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLShaderVar.h
===================================================================
--- src/gpu/gl/GrGLShaderVar.h (revision 8803)
+++ src/gpu/gl/GrGLShaderVar.h (working copy)
@@ -29,8 +29,11 @@
kNone_TypeModifier,
kOut_TypeModifier,
kIn_TypeModifier,
+ kInOut_TypeModifier,
kUniform_TypeModifier,
- kAttribute_TypeModifier
+ kAttribute_TypeModifier,
+ kVaryingIn_TypeModifier,
+ kVaryingOut_TypeModifier
};
enum Precision {
@@ -303,14 +306,20 @@
switch (t) {
case kNone_TypeModifier:
return "";
+ case kIn_TypeModifier:
+ return "in";
+ case kInOut_TypeModifier:
+ return "inout";
case kOut_TypeModifier:
- return k110_GrGLSLGeneration == gen ? "varying" : "out";
- case kIn_TypeModifier:
- return k110_GrGLSLGeneration == gen ? "varying" : "in";
+ 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:
GrCrash("Unknown shader variable type modifier.");
return ""; // suppress warning
« no previous file with comments | « src/gpu/gl/GrGLShaderBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698