This fixes crash when:
- first pass begins with alpha inst
- first pass ends with color inst, second pass begins with alpha inst
Also, use the symbolic name instead of a number.
Piglit: spec/ati_fragment_shader/api-alphafirst
Signed-off-by: Miklós Máté <mtm...@gmail.com>
---
src/mesa/main/atifragshader.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index 49ddb6e5af..d6fc37ac8f 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -598,8 +598,10 @@ _mesa_FragmentOpXATI(GLint optype, GLuint arg_count,
GLenum op, GLuint dst,
curProg->cur_pass=3;
/* decide whether this is a new instruction or not ... all color
instructions are new,
- and alpha instructions might also be new if there was no preceding color
inst */
- if ((optype == 0) || (curProg->last_optype == optype)) {
+ and alpha instructions might also be new if there was no preceding color
inst,
+ and this may be the first inst of the pass */
+ if ((optype == ATI_FRAGMENT_SHADER_COLOR_OP) || (curProg->last_optype ==
optype)
+ || (curProg->numArithInstr[curProg->cur_pass >> 1] == 0)) {
if (curProg->numArithInstr[curProg->cur_pass >> 1] > 7) {
_mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(instrCount)");
return;
--
2.15.0.rc0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
