summaryrefslogtreecommitdiff
authorDave Airlie <airlied@redhat.com>2012-04-21 09:37:08 (GMT)
committer Dave Airlie <airlied@redhat.com>2012-04-21 09:38:31 (GMT)
commit12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703 (patch) (side-by-side diff)
treede16e21d08e9fc3f04b053b651a0599a54acea38
parent5f457f66186375d5fb82d5a0a81025887bfe2d2e (diff)
downloadmesa-12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703.zip
mesa-12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703.tar.gz
r600: enable glsl 1.30 on r700
I've done a piglit run on rv740 and confirmed no regressions. We don't get GL3 on r700 due to transform feedback being busted still. 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 3a947d8..ad880dc 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 ? TRUE : FALSE;
+ glsl130_default = (rscreen->chip_class == EVERGREEN || rscreen->chip_class == R700) ? TRUE : FALSE;
rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", glsl130_default) ? 130 : 120;
return &rscreen->screen;