Mesa (master): r600g: enable glsl 130 on evergreen.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Apr 20 19:01:57 2012 +0100

r600g: enable glsl 130 on evergreen.

I've done a piglit run on my SUMO machine and I see no regressions.

Lots of things to fix (skip->fail), but hey maybe we can fix them
if we can see them.

I'll try and work my way across r600,700,cayman sometime if nobody
else gets to them.

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

---

 src/gallium/drivers/r600/r600_pipe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index b1bb26a..34e508a 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -803,6 +803,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;
 	}
@@ -875,7 +876,8 @@ 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);
-	rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", FALSE) ? 130 : 120;
+	glsl130_default = rscreen->chip_class == EVERGREEN ? TRUE : FALSE;
+	rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", glsl130_default) ? 130 : 120;
 
 	return &rscreen->screen;
 }