Mesa (master): glsl/builtins: Uncomment textureSize prototypes.

Kenneth Graunke kwg at kemper.freedesktop.org
Tue Aug 23 11:18:40 PDT 2011


Module: Mesa
Branch: master
Commit: 2054652796d78996b1f9308ab1a75361d71e864e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2054652796d78996b1f9308ab1a75361d71e864e

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Feb 25 15:14:47 2011 -0800

glsl/builtins: Uncomment textureSize prototypes.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/glsl/builtins/profiles/130.frag |    2 --
 src/glsl/builtins/profiles/130.vert |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/glsl/builtins/profiles/130.frag b/src/glsl/builtins/profiles/130.frag
index 0e3c7ac..c121859 100644
--- a/src/glsl/builtins/profiles/130.frag
+++ b/src/glsl/builtins/profiles/130.frag
@@ -465,7 +465,6 @@ bvec4 not(bvec4 x);
  * 8.7 - Texture Lookup Functions
  */
 
-#if 0
 /* textureSize */
 int   textureSize( sampler1D sampler, int lod);
 int   textureSize(isampler1D sampler, int lod);
@@ -496,7 +495,6 @@ ivec3 textureSize(usampler2DArray sampler, int lod);
 
 ivec2 textureSize(sampler1DArrayShadow sampler, int lod);
 ivec3 textureSize(sampler2DArrayShadow sampler, int lod);
-#endif
 
 /* texture - no bias */
  vec4 texture( sampler1D sampler, float P);
diff --git a/src/glsl/builtins/profiles/130.vert b/src/glsl/builtins/profiles/130.vert
index f85b27f..ebd9a50 100644
--- a/src/glsl/builtins/profiles/130.vert
+++ b/src/glsl/builtins/profiles/130.vert
@@ -467,7 +467,6 @@ bvec4 not(bvec4 x);
  * 8.7 - Texture Lookup Functions
  */
 
-#if 0
 /* textureSize */
 int   textureSize( sampler1D sampler, int lod);
 int   textureSize(isampler1D sampler, int lod);
@@ -498,7 +497,6 @@ ivec3 textureSize(usampler2DArray sampler, int lod);
 
 ivec2 textureSize(sampler1DArrayShadow sampler, int lod);
 ivec3 textureSize(sampler2DArrayShadow sampler, int lod);
-#endif
 
 /* texture - no bias */
  vec4 texture( sampler1D sampler, float P);



More information about the mesa-commit mailing list