diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 4579a58b820..fc77926d6e0 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -31,6 +31,7 @@ #include <pthread.h> #include "main/imports.h" +#include "main/glspirv.h" #include "program/prog_parameter.h" #include "program/prog_print.h" #include "program/prog_to_nir.h" @@ -74,9 +75,14 @@ brw_create_nir(struct brw_context *brw, ctx->Const.ShaderCompilerOptions[stage].NirOptions; nir_shader *nir; - /* First, lower the GLSL IR or Mesa IR to NIR */ + /* First, lower the GLSL/Mesa IR or SPIR-V to NIR */ if (shader_prog) { - nir = glsl_to_nir(shader_prog, stage, options); + if (shader_prog->_LinkedShaders[stage]->spirv_data) + nir = _mesa_spirv_to_nir(ctx, shader_prog, stage, options); + else + nir = glsl_to_nir(shader_prog, stage, options); + assert (nir); + nir_remove_dead_variables(nir, nir_var_shader_in | nir_var_shader_out); nir_lower_returns(nir); nir_validate_shader(nir); |