summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2018-06-18 12:36:54 +1000
committerTimothy Arceri <[email protected]>2018-06-19 09:21:33 +1000
commit89a5d6f71517511e809a0d4d163d5f2a3d6201a5 (patch)
tree181c0fc934c12f4bae93263182c3344c5d5cda87 /src
parente636199c1c7dc9bc0525f5ae2a4eef05a8092180 (diff)
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]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/ff_fragment_shader.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index a698931d99e..935a21624af 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;