summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-04-12 16:28:37 -0700
committerEric Anholt <[email protected]>2012-04-16 11:28:18 -0700
commitd91c8edd851839799d8338ecc127ea004d76fcab (patch)
tree63a0541eff51fb304fc62676b538de94149ca966 /src/glsl
parent9a01e09ee57a875ccff58316c81395c3f1094aa6 (diff)
glsl: Add textureSize(*samplerBuffer) support.
Fixes the corresponding new tests in piglit. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/builtins/profiles/140.frag4
-rw-r--r--src/glsl/builtins/profiles/140.vert4
-rwxr-xr-xsrc/glsl/builtins/tools/texture_builtins.py1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/glsl/builtins/profiles/140.frag b/src/glsl/builtins/profiles/140.frag
index b534827c994..ba616a1cf7f 100644
--- a/src/glsl/builtins/profiles/140.frag
+++ b/src/glsl/builtins/profiles/140.frag
@@ -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);
diff --git a/src/glsl/builtins/profiles/140.vert b/src/glsl/builtins/profiles/140.vert
index 7aa92402c38..1aab72cc0bb 100644
--- a/src/glsl/builtins/profiles/140.vert
+++ b/src/glsl/builtins/profiles/140.vert
@@ -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);
diff --git a/src/glsl/builtins/tools/texture_builtins.py b/src/glsl/builtins/tools/texture_builtins.py
index bbbbd0bd0c5..3d957e272d3 100755
--- a/src/glsl/builtins/tools/texture_builtins.py
+++ b/src/glsl/builtins/tools/texture_builtins.py
@@ -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")