Mesa (master): r600g: enable GLSL130 on all cards

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Apr 22 08:09:05 2012 +0100

r600g: enable GLSL130 on all cards

Alexandre Demers sent me some cayman results with no major problems.

I'll rip out the env var in a week or so.

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

---

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

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 1f4268b..bfe413c 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -804,7 +804,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;
 	}
@@ -877,8 +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 >= R600 && rscreen->chip_class <= EVERGREEN) ? TRUE : FALSE;
-	rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", glsl130_default) ? 130 : 120;
+	rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", TRUE) ? 130 : 120;
 
 	return &rscreen->screen;
 }