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

Author: Timothy Arceri <[email protected]>
Date:   Mon Jun 18 12:36:54 2018 +1000

mesa: add ff fragment shader support for geom and tess shaders

This is required for compatibility profile support.

Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Iago Toral Quiroga <[email protected]>

---

 src/mesa/main/ff_fragment_shader.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/ff_fragment_shader.cpp 
b/src/mesa/main/ff_fragment_shader.cpp
index a698931d99..935a21624a 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -229,7 +229,11 @@ static GLbitfield filter_fp_input_mask( GLbitfield 
fp_inputs,
     * since vertex shader state validation comes after fragment state
     * validation (see additional comments in state.c).
     */
-   if (vertexShader)
+   if (ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY] != NULL)
+      vprog = ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
+   else if (ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_EVAL] != NULL)
+      vprog = ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_EVAL];
+   else if (vertexShader)
       vprog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
    else
       vprog = ctx->VertexProgram.Current;

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to