<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">2018-06-18 4:39 GMT+02:00 Timothy Arceri <span dir="ltr"><<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is required for compatibility profile support. </blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
 src/mesa/main/ff_fragment_<wbr>shader.cpp | 6 +++++-<br>
 1 file changed, 5 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/main/ff_fragment_<wbr>shader.cpp b/src/mesa/main/ff_fragment_<wbr>shader.cpp<br>
index a698931d99e..935a21624af 100644<br>
--- a/src/mesa/main/ff_fragment_<wbr>shader.cpp<br>
+++ b/src/mesa/main/ff_fragment_<wbr>shader.cpp<br>
@@ -229,7 +229,11 @@ static GLbitfield filter_fp_input_mask( GLbitfield fp_inputs,<br>
     * since vertex shader state validation comes after fragment state<br>
     * validation (see additional comments in state.c).<br>
     */<br>
-   if (vertexShader)<br>
+   if (ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_GEOMETRY] != NULL)<br>
+      vprog = ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_GEOMETRY];<br>
+   else if (ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_TESS_EVAL] != NULL)<br>
+      vprog = ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_TESS_EVAL];<br>
+   else if (vertexShader)<br></blockquote><div>

<div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><br class="gmail-Apple-interchange-newline"><br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">Shouldn't you also update the if condition on line 178? Otherwise, you won't reach the if tree you change when the vertex shader is missing (unless that was intended - I am not really familiar with how fixed function shaders work alongside new features).</div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">You could also move or update the comment that is just above your change.</div>

<br></div><div>Regards,</div><div>Gustaw Smolarczyk</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
       vprog = ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_VERTEX];<br>
    else<br>
       vprog = ctx->VertexProgram.Current;<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.17.1<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></div>