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

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

Issue 1785873003: Implement GL support for buffer textures (Closed) Base URL: https://skia.googlesource.com/skia.git@upload_glTexBuffer
Patch Set: rebase Created 4 years, 9 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/GrGLTexture.cpp ('k') | src/gpu/glsl/GrGLSLProgramBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/glsl/GrGLSL.h
diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h
index 12c1f1fcc6b375e35a677757f28adf76d0a4662a..8ae6219d874ad220d7b3c686690d7abe76547b21 100644
--- a/src/gpu/glsl/GrGLSL.h
+++ b/src/gpu/glsl/GrGLSL.h
@@ -56,9 +56,13 @@ bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration);
* Gets the name of the function that should be used to sample a 2D texture. Coord type is used
* to indicate whether the texture is sampled using projective textured (kVec3f) or not (kVec2f).
*/
-inline const char* GrGLSLTexture2DFunctionName(GrSLType coordType, GrSLType samplerType,
- GrGLSLGeneration glslGen) {
+inline const char* GrGLSLTextureFunctionName(GrSLType coordType, GrSLType samplerType,
+ GrGLSLGeneration glslGen) {
SkASSERT(GrSLTypeIsSamplerType(samplerType));
+ if (kSamplerBuffer_GrSLType == samplerType) {
+ SkASSERT(kInt_GrSLType == coordType);
+ return "texelFetch";
+ }
SkASSERT(kVec2f_GrSLType == coordType || kVec3f_GrSLType == coordType);
// GL_TEXTURE_RECTANGLE_ARB is written against OpenGL 2.0/GLSL 1.10. At that time there were
// separate texture*() functions. In OpenGL 3.0/GLSL 1.30 the different texture*() functions
@@ -110,6 +114,8 @@ static inline const char* GrGLSLTypeString(GrSLType t) {
return "samplerExternalOES";
case kSampler2DRect_GrSLType:
return "sampler2DRect";
+ case kSamplerBuffer_GrSLType:
+ return "samplerBuffer";
case kBool_GrSLType:
return "bool";
case kInt_GrSLType:
« no previous file with comments | « src/gpu/gl/GrGLTexture.cpp ('k') | src/gpu/glsl/GrGLSLProgramBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698