Re: [Mesa-dev] [PATCH v2 02/21] i965: use gl_shader_program_data::spirv

2018-06-05 Thread Timothy Arceri 

I still dislike the idea of this bool but in the name of progress.

Patches 1-2 are:

Reviewed-by: Timothy Arceri 

On 12/05/18 19:40, Alejandro Piñeiro wrote:

---
  src/mesa/drivers/dri/i965/brw_program.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_program.c 
b/src/mesa/drivers/dri/i965/brw_program.c
index fc77926d6e0..39c2d2a3581 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -77,7 +77,7 @@ brw_create_nir(struct brw_context *brw,
  
 /* First, lower the GLSL/Mesa IR or SPIR-V to NIR */

 if (shader_prog) {
-  if (shader_prog->_LinkedShaders[stage]->spirv_data)
+  if (shader_prog->data->spirv)
   nir = _mesa_spirv_to_nir(ctx, shader_prog, stage, options);
else
   nir = glsl_to_nir(shader_prog, stage, options);


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 02/21] i965: use gl_shader_program_data::spirv

2018-05-12 Thread Alejandro Piñeiro 
---
 src/mesa/drivers/dri/i965/brw_program.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_program.c 
b/src/mesa/drivers/dri/i965/brw_program.c
index fc77926d6e0..39c2d2a3581 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -77,7 +77,7 @@ brw_create_nir(struct brw_context *brw,
 
/* First, lower the GLSL/Mesa IR or SPIR-V to NIR */
if (shader_prog) {
-  if (shader_prog->_LinkedShaders[stage]->spirv_data)
+  if (shader_prog->data->spirv)
  nir = _mesa_spirv_to_nir(ctx, shader_prog, stage, options);
   else
  nir = glsl_to_nir(shader_prog, stage, options);
-- 
2.14.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev