From 1256ab18c12955497e0564b606232473c8feec34 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 12 Jan 2018 12:38:13 +1100 Subject: [PATCH] radeonsi: bump glsl version to 450 for nir backend MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We still have more work to do but piglit results are looking pretty good. At GLSL 1.50 we have 30647/31118 piglit tests passing. At GLSL 4.50 we have 37927/38551 piglit tests passing. Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_get.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index caf6e9d19ff..7072cfc1f55 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -226,8 +226,6 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 4; case PIPE_CAP_GLSL_FEATURE_LEVEL: - if (sscreen->debug_flags & DBG(NIR)) - return 150; /* no tessellation shaders yet */ if (si_have_tgsi_compute(sscreen)) return 450; return 420; @@ -451,10 +449,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen, case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT: return 32; case PIPE_SHADER_CAP_PREFERRED_IR: - if (sscreen->debug_flags & DBG(NIR) && - (shader == PIPE_SHADER_VERTEX || - shader == PIPE_SHADER_GEOMETRY || - shader == PIPE_SHADER_FRAGMENT)) + if (sscreen->debug_flags & DBG(NIR)) return PIPE_SHADER_IR_NIR; return PIPE_SHADER_IR_TGSI; case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: -- 2.30.2