summaryrefslogtreecommitdiff
authorDave Airlie <airlied@redhat.com>2012-04-22 07:09:05 (GMT)
committer Dave Airlie <airlied@redhat.com>2012-04-22 07:09:05 (GMT)
commite6aad9ba04fb914a2484241f74ed0557fd1d59da (patch) (side-by-side diff)
treefdaf0293c1c0be274ca6ab3c0d5ec1a4cf1c94eb
parent47d22e56de4738f792bb9a86da23435744d53f00 (diff)
downloadmesa-e6aad9ba04fb914a2484241f74ed0557fd1d59da.zip
mesa-e6aad9ba04fb914a2484241f74ed0557fd1d59da.tar.gz
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@redhat.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c5
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;
}