summaryrefslogtreecommitdiff
path: root/src/mesa/main/texenvprogram.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-02-18 23:51:01 -0800
committerKristian Høgsberg <krh@bitplanet.net>2010-02-19 09:19:20 -0500
commit2efa86ea3040c37965987160733b22e2a0541a3e (patch)
tree9670602a59b673faa1c886c7e436c18425abc2ea /src/mesa/main/texenvprogram.c
parent26f8fad1456fdc2b352cea9d3b4c32cb5f6ae947 (diff)
Remove _mesa_memcmp in favor of plain memcmp.
This may break the SUNOS4 build, but it's no longer relevant.
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
-rw-r--r--src/mesa/main/texenvprogram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 35a2cebab8..f790fd6562 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1095,7 +1095,7 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
emit_arith( p, OPCODE_MAD, tmp0, WRITEMASK_XYZW, 0,
two, src[0], neg1);
- if (_mesa_memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
+ if (memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
tmp1 = tmp0;
else
emit_arith( p, OPCODE_MAD, tmp1, WRITEMASK_XYZW, 0,
@@ -1494,7 +1494,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
emit_arith( &p, OPCODE_ADD, out, WRITEMASK_XYZ, 0, cf, s, undef );
emit_arith( &p, OPCODE_MOV, out, WRITEMASK_W, 0, cf, undef, undef );
}
- else if (_mesa_memcmp(&cf, &out, sizeof(cf)) != 0) {
+ else if (memcmp(&cf, &out, sizeof(cf)) != 0) {
/* Will wind up in here if no texture enabled or a couple of
* other scenarios (GL_REPLACE for instance).
*/