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

Unified Diff: src/gpu/glsl/GrGLSLFragmentShaderBuilder.h

Issue 1451683002: Initial version of external_oes texture support and unit test (Closed) Base URL: https://skia.googlesource.com/skia.git@target
Patch Set: angle cleanup Created 5 years, 1 month 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
Index: src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
index 924e3110dfddc217d2260679aa2021d83c82eada..e8746878eb4a01b0b476cc83491747a58bc297ca 100644
--- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
+++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
@@ -33,6 +33,7 @@ public:
*/
enum GLSLFeature {
kStandardDerivatives_GLSLFeature = 0,
+ kExternalSampler_GLSLFeature = 1,
egdaniel 2015/11/20 21:57:43 is this public feature enum needed?
bsalomon 2015/11/20 22:43:55 Done.
kLastGLSLFeature = kStandardDerivatives_GLSLFeature
};
@@ -172,6 +173,7 @@ private:
kFragCoordConventions_GLSLPrivateFeature = kLastGLSLFeature + 1,
kBlendEquationAdvanced_GLSLPrivateFeature,
kBlendFuncExtended_GLSLPrivateFeature,
+ kExternalTexture_GLSLPrivateFeature,
kLastGLSLPrivateFeature = kBlendFuncExtended_GLSLPrivateFeature
};

Powered by Google App Engine
This is Rietveld 408576698