summaryrefslogtreecommitdiff
authorDave Airlie <airlied@redhat.com>2012-04-21 16:40:32 (GMT)
committer Dave Airlie <airlied@redhat.com>2012-04-21 16:40:32 (GMT)
commit7745cf2be4abfbac0a5f7981d7c3dd2f4d0cbcbe (patch) (side-by-side diff)
tree14648c2e32ef3020741f74638b7e4baa337b13c5
parent12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703 (diff)
downloadmesa-7745cf2be4abfbac0a5f7981d7c3dd2f4d0cbcbe.zip
mesa-7745cf2be4abfbac0a5f7981d7c3dd2f4d0cbcbe.tar.gz
r600g: enable GLSL 1.30 for r600 class
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index ad880dc..c212f00 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -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);
- 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;