From: Dave Airlie Date: Mon, 23 Oct 2017 22:43:31 +0000 (+0100) Subject: st/mesa: enable nir path for all shaders. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74fc9e9186389df1d94d82e919b5ae1576d7d68a;p=mesa.git st/mesa: enable nir path for all shaders. There is no reason to block this here, if a driver enables it, let it handle it. Reviewed-by: Timothy Arceri Signed-off-by: Dave Airlie --- diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index aa225df63d6..eaed052a17d 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6973,15 +6973,7 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) struct gl_program *linked_prog = NULL; if (preferred_ir == PIPE_SHADER_IR_NIR) { - /* TODO only for GLSL VS/FS/CS for now: */ - switch (shader->Stage) { - case MESA_SHADER_VERTEX: - case MESA_SHADER_FRAGMENT: - case MESA_SHADER_COMPUTE: - linked_prog = st_nir_get_mesa_program(ctx, prog, shader); - default: - break; - } + linked_prog = st_nir_get_mesa_program(ctx, prog, shader); } else { linked_prog = get_mesa_program_tgsi(ctx, prog, shader); }