r600g: enable GLSL130 on all cards

Alexandre Demers sent me some cayman results with no major problems.

I'll rip out the env var in a week or so.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 1f4268ba57792218abae28c85209a134b1e2d0e2..bfe413c17863f39ff98eb212a1d5e3607e21c3fd 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -804,7 +804,7 @@ static unsigned radeon_family_from_device(unsigned device)
 struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
 {
        struct r600_screen *rscreen = CALLOC_STRUCT(r600_screen);
-       boolean glsl130_default;
+
        if (rscreen == NULL) {
                return NULL;
        }
@@ -877,8 +877,7 @@ 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);
-       glsl130_default = (rscreen->chip_class >= R600 && rscreen->chip_class <= EVERGREEN) ? TRUE : FALSE;
-       rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", glsl130_default) ? 130 : 120;
+       rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", TRUE) ? 130 : 120;
 
        return &rscreen->screen;
 }