r600g: enable GLSL 1.30 for r600 class
authorDave Airlie <airlied@redhat.com>
Sat, 21 Apr 2012 16:40:32 +0000 (17:40 +0100)
committerDave Airlie <airlied@redhat.com>
Sat, 21 Apr 2012 16:40:32 +0000 (17:40 +0100)
Full piglit run on my rv610 with no regressions.

This only leaves cayman, however my cayman is resisting my attempt
to get through a full piglit run.

Signed-off-by: Dave Airlie <airlied@redhat.com>
src/gallium/drivers/r600/r600_pipe.c

index ad880dce8bf88ef66da167dc34592d051785d686..c212f007034fd44e1ad642a948ae19e07abf23b4 100644 (file)
@@ -877,7 +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);
        pipe_mutex_init(rscreen->fences.mutex);
 
        rscreen->use_surface_alloc = debug_get_bool_option("R600_SURF", TRUE);
-       glsl130_default = (rscreen->chip_class == EVERGREEN || rscreen->chip_class == R700) ? TRUE : FALSE;
+       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;
 
        return &rscreen->screen;
        rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", glsl130_default) ? 130 : 120;
 
        return &rscreen->screen;