aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/atifragshader.c
diff options
context:
space:
mode:
authorMiklós Máté <[email protected]>2017-12-02 23:35:25 +0100
committerMarek Olšák <[email protected]>2017-12-25 14:32:23 +0100
commit3667714ccdd558c37b5e1a5f2265a9be98659675 (patch)
tree3127a4386517337785a9eb691bf8340a237b4143 /src/mesa/main/atifragshader.c
parent0fd82f545532c6b72d583524451b5ef56e139eee (diff)
mesa: always compare optype with symbolic name in ATI_fs
Signed-off-by: Miklós Máté <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main/atifragshader.c')
-rw-r--r--src/mesa/main/atifragshader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index 8538e3a53e3..6b636f1dc74 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -76,7 +76,7 @@ _mesa_delete_ati_fragment_shader(struct gl_context *ctx, struct ati_fragment_sha
static void match_pair_inst(struct ati_fragment_shader *curProg, GLuint optype)
{
if (optype == curProg->last_optype) {
- curProg->last_optype = 1;
+ curProg->last_optype = ATI_FRAGMENT_SHADER_ALPHA_OP;
}
}
@@ -125,7 +125,7 @@ static void debug_op(GLint optype, GLuint arg_count, GLenum op, GLuint dst,
fprintf(stderr, "%s(%s, %s", op_name, _mesa_enum_to_string(op),
_mesa_enum_to_string(dst));
- if (!optype)
+ if (optype == ATI_FRAGMENT_SHADER_COLOR_OP)
fprintf(stderr, ", %d", dstMask);
fprintf(stderr, ", %s", create_dst_mod_str(dstMod));
@@ -631,7 +631,7 @@ _mesa_FragmentOpXATI(GLint optype, GLuint arg_count, GLenum op, GLuint dst,
_mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(op)");
return;
}
- if (optype == 1) {
+ if (optype == ATI_FRAGMENT_SHADER_ALPHA_OP) {
if (((op == GL_DOT2_ADD_ATI) && (curI->Opcode[0] != GL_DOT2_ADD_ATI)) ||
((op == GL_DOT3_ATI) && (curI->Opcode[0] != GL_DOT3_ATI)) ||
((op == GL_DOT4_ATI) && (curI->Opcode[0] != GL_DOT4_ATI)) ||