summaryrefslogtreecommitdiff
authorDave Airlie <airlied@redhat.com>2012-04-20 18:01:57 (GMT)
committer Dave Airlie <airlied@redhat.com>2012-04-20 18:01:57 (GMT)
commit7af9f6325ee3b9791fba7b49c60496c42fa79e6b (patch) (side-by-side diff)
treeab35de6b630166532008849472be2d2caf466891
parent951b888be45539e5d5b535a5a393df719fae4172 (diff)
downloadmesa-7af9f6325ee3b9791fba7b49c60496c42fa79e6b.zip
mesa-7af9f6325ee3b9791fba7b49c60496c42fa79e6b.tar.gz
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@redhat.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c4
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;
}