Mesa (master): st/mesa: enable nir path for all shaders.

Dave Airlie airlied at kemper.freedesktop.org
Thu Oct 26 00:00:46 UTC 2017


Module: Mesa
Branch: master
Commit: 74fc9e9186389df1d94d82e919b5ae1576d7d68a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=74fc9e9186389df1d94d82e919b5ae1576d7d68a

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Oct 23 23:43:31 2017 +0100

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 <tarceri at itsqueeze.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index aa225df63d..eaed052a17 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);
       }




More information about the mesa-commit mailing list