r600g: don't check the R600_GLSL130 env var

GLSL 1.3 has been enabled by default for quite a while.

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 7750c425f84ab4aaa859a91c4ef688215255e78f..a143381246ef1db4397cf89f5aa6ecf52b88c7a2 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -391,7 +391,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 256;
 
        case PIPE_CAP_GLSL_FEATURE_LEVEL:
-               return rscreen->glsl_feature_level;
+               return 130;
 
        /* Supported except the original R600. */
        case PIPE_CAP_INDEP_BLEND_ENABLE:
@@ -489,7 +489,6 @@ static float r600_get_paramf(struct pipe_screen* pscreen,
 
 static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
 {
-       struct r600_screen *rscreen = (struct r600_screen *)pscreen;
        switch(shader)
        {
        case PIPE_SHADER_FRAGMENT:
@@ -539,7 +538,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_SUBROUTINES:
                return 0;
        case PIPE_SHADER_CAP_INTEGERS:
-               return rscreen->glsl_feature_level >= 130;
+               return 1;
        case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
                return 16;
         case PIPE_SHADER_CAP_PREFERRED_IR:
@@ -952,7 +951,6 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        pipe_mutex_init(rscreen->fences.mutex);
 
        rscreen->use_surface_alloc = debug_get_bool_option("R600_SURF", TRUE);
-       rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", TRUE) ? 130 : 120;
 
        rscreen->global_pool = compute_memory_pool_new(rscreen);
 

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 058104085a18d2dd91bf52940e1aa46eac3c820e..6449a4d4042912668b6e847c436ba3a21d388867 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -143,7 +143,6 @@ struct r600_screen {
        struct r600_pipe_fences         fences;
 
        bool                            use_surface_alloc;
-       int                             glsl_feature_level;
 
        /*for compute global memory binding, we allocate stuff here, instead of
         * buffers.

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 4dd424367a95c2e4655b8a0d98b73506409e9104..cf912c1267d7f3678695d5dddb7e22d1aa15e7c7 100644 (file)
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1163,7 +1163,7 @@ static int r600_shader_from_tgsi(struct r600_context * rctx, struct r600_pipe_sh
 #endif
        ctx.bc = &shader->bc;
        ctx.shader = shader;
-       ctx.native_integers = (rctx->screen->glsl_feature_level >= 130);
+       ctx.native_integers = true;
 
        r600_bytecode_init(ctx.bc, rctx->chip_class, rctx->family);
        ctx.tokens = tokens;