Mesa (master): i965: Don't call process_glsl_ir() for SPIR-V shaders

Alejandro Pinheiro apinheiro at kemper.freedesktop.org
Fri Mar 30 10:30:47 UTC 2018


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

Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Tue Oct 10 14:08:35 2017 +0200

i965: Don't call process_glsl_ir() for SPIR-V shaders

v2: Use 'spirv_data' from gl_linked_shader instead, to check if shader
   is SPIR-V. (Timothy Arceri)

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/drivers/dri/i965/brw_link.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 274a738cbb..7841626dc3 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -237,7 +237,8 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
       struct gl_program *prog = shader->Program;
       prog->Parameters = _mesa_new_parameter_list();
 
-      process_glsl_ir(brw, shProg, shader);
+      if (!shader->spirv_data)
+         process_glsl_ir(brw, shProg, shader);
 
       _mesa_copy_linked_program_data(shProg, shader);
 




More information about the mesa-commit mailing list