Mesa (master): r600: enable glsl 1.30 on r700

Dave Airlie airlied at kemper.freedesktop.org
Sat Apr 21 02:38:39 PDT 2012


Module: Mesa
Branch: master
Commit: 12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12bedaa24ba8f4cdb3f2b58482ce8f9ac5715703

Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Apr 21 10:37:08 2012 +0100

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 at redhat.com>

---

 src/gallium/drivers/r600/r600_pipe.c |    2 +-
 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;



More information about the mesa-commit mailing list