<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek</div><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Jun 17, 2018 at 10:39 PM, Timothy Arceri <span dir="ltr"><<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>></span> wrote:<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.<br>
---<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>
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>