Mesa (master): st/mesa: only expose ARB_shader_bit_encoding with GLSL 1.3

Marek Olšák mareko at kemper.freedesktop.org
Thu Jul 5 22:49:33 UTC 2012


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Wed Jul  4 02:35:39 2012 +0200

st/mesa: only expose ARB_shader_bit_encoding with GLSL 1.3

I don't think it's possible or even useful to use the extension with GLSL 1.2.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_extensions.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 6fea1fa..fd95075 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -578,6 +578,7 @@ void st_init_extensions(struct st_context *st)
 
       /* Extensions that only depend on GLSL 1.3. */
       ctx->Extensions.ARB_conservative_depth = GL_TRUE;
+      ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE;
    } else {
       /* Optional integer support for GLSL 1.2. */
       if (screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
@@ -595,10 +596,6 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.S3_s3tc = GL_FALSE;
    }
 
-   if (ctx->Const.NativeIntegers) {
-      ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE;
-   }
-
    if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY,
                                 PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
 #if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */




More information about the mesa-commit mailing list