<div dir="ltr">r-b<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Sep 25, 2016 at 5:50 AM, Timothy Arceri <span dir="ltr"><<a href="mailto:timothy.arceri@collabora.com" target="_blank">timothy.arceri@collabora.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">We already pass the shader so we can just get the stage from this.<br>
---<br>
src/mesa/drivers/dri/i965/brw_<wbr>link.cpp | 8 +++-----<br>
1 file changed, 3 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>brw_link.cpp b/src/mesa/drivers/dri/i965/<wbr>brw_link.cpp<br>
index fc2e539..a0097ef 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>brw_link.cpp<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>brw_link.cpp<br>
@@ -86,8 +86,7 @@ brw_lower_packing_builtins(<wbr>struct brw_context *brw,<br>
}<br>
<br>
static void<br>
-process_glsl_ir(gl_shader_<wbr>stage stage,<br>
- struct brw_context *brw,<br>
+process_glsl_ir(struct brw_context *brw,<br>
struct gl_shader_program *shader_prog,<br>
struct gl_linked_shader *shader)<br>
{<br>
@@ -140,8 +139,7 @@ process_glsl_ir(gl_shader_<wbr>stage stage,<br>
do_copy_propagation(shader-><wbr>ir);<br>
<br>
bool lowered_variable_indexing =<br>
- lower_variable_index_to_cond_<wbr>assign((gl_shader_stage)stage,<br>
- shader->ir,<br>
+ lower_variable_index_to_cond_<wbr>assign(shader->Stage, shader->ir,<br>
options->EmitNoIndirectInput,<br>
options->EmitNoIndirectOutput,<br>
options->EmitNoIndirectTemp,<br>
@@ -227,7 +225,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)<br>
<br>
_mesa_copy_linked_program_<wbr>data((gl_shader_stage) stage, shProg, prog);<br>
<br>
- process_glsl_ir((gl_shader_<wbr>stage) stage, brw, shProg, shader);<br>
+ process_glsl_ir(brw, shProg, shader);<br>
<br>
/* Make a pass over the IR to add state references for any built-in<br>
* uniforms that are used. This has to be done now (during linking).<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>