AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fix crash when an ATI_fs pass begins with an alpha inst

Browse Source 
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

v2: fixed formatting

Signed-off-by: Miklós Máté <mtmkls@gmail.com>
This commit is contained in:
Miklós Máté
2017-12-02 23:35:18 +01:00
committed by Marek Olšák
parent 178a3dfb0e
commit 4003ad298a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/atifragshader.c
+7 -3
View File
@@ -597,9 +597,13 @@ _mesa_FragmentOpXATI(GLint optype, GLuint arg_count, GLenum op, GLuint dst,
else if (curProg->cur_pass==2)
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)) {
/* 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. This may also 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;