glsl: Add textureSize(*samplerBuffer) support.
authorEric Anholt <eric@anholt.net>
Thu, 12 Apr 2012 23:28:37 +0000 (16:28 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 16 Apr 2012 18:28:18 +0000 (11:28 -0700)
Fixes the corresponding new tests in piglit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/builtins/profiles/140.frag
src/glsl/builtins/profiles/140.vert
src/glsl/builtins/tools/texture_builtins.py

index b534827..ba616a1 100644 (file)
@@ -504,6 +504,10 @@ ivec2 textureSize(isampler2DRect sampler);
 ivec2 textureSize(usampler2DRect sampler);
 ivec2 textureSize(sampler2DRectShadow sampler);
 
+int  textureSize( samplerBuffer sampler);
+int  textureSize(isamplerBuffer sampler);
+int  textureSize(usamplerBuffer sampler);
+
 /* texture - no bias */
  vec4 texture( sampler1D sampler, float P);
 ivec4 texture(isampler1D sampler, float P);
index 7aa9240..1aab72c 100644 (file)
@@ -504,6 +504,10 @@ ivec2 textureSize(isampler2DRect sampler);
 ivec2 textureSize(usampler2DRect sampler);
 ivec2 textureSize(sampler2DRectShadow sampler);
 
+int  textureSize( samplerBuffer sampler);
+int  textureSize(isamplerBuffer sampler);
+int  textureSize(usamplerBuffer sampler);
+
 /* texture */
  vec4 texture( sampler1D sampler, float P);
 ivec4 texture(isampler1D sampler, float P);
index bbbbd0b..3d957e2 100755 (executable)
@@ -162,6 +162,7 @@ def generate_texture_functions(fs):
     generate_sigs("", "txs", "2DArrayShadow")
     generate_fiu_sigs("txs", "2DRect")
     generate_sigs("", "txs", "2DRectShadow")
+    generate_fiu_sigs("txs", "Buffer")
     end_function(fs, "textureSize")
 
     start_function("texture")