From: Dave Airlie Date: Sat, 21 Apr 2012 16:40:32 +0000 (+0100) Subject: r600g: enable GLSL 1.30 for r600 class X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7745cf2be4abfbac0a5f7981d7c3dd2f4d0cbcbe;p=mesa.git r600g: enable GLSL 1.30 for r600 class Full piglit run on my rv610 with no regressions. This only leaves cayman, however my cayman is resisting my attempt to get through a full piglit run. Signed-off-by: Dave Airlie --- diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index ad880dce8bf..c212f007034 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 || rscreen->chip_class == R700) ? TRUE : FALSE; + 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; return &rscreen->screen;