summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-07-04 02:35:39 +0200
committerMarek Olšák <[email protected]>2012-07-06 00:45:38 +0200
commitc445b0f76db5fd6cf7340bba9db09118c8639e0d (patch)
tree799899070385ae76072295b3e759008b5c94a991 /src/mesa
parent5f5746a692e8f279dcba9e25ad0bb2c41a546f6e (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_extensions.c5
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 6fea1fa080d..fd95075368a 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 */