use mesa import wrappers, bug 4468

This commit is contained in:
Brian Paul
2005-09-16 18:14:24 +00:00
parent 3cc67cb8cd
commit aa2069586d
20 changed files with 45 additions and 29 deletions

View File

@@ -480,7 +480,7 @@ emit_op(struct texenv_fragment_program *p,
GLuint nr = p->program->Base.NumInstructions++;
struct fp_instruction *inst = &p->program->Instructions[nr];
memset(inst, 0, sizeof(*inst));
_mesa_memset(inst, 0, sizeof(*inst));
inst->Opcode = op;
emit_arg( &inst->SrcReg[0], src0 );
@@ -792,7 +792,7 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
emit_arith( p, FP_OPCODE_MAD, tmp0, WRITEMASK_XYZW, 0,
two, src[0], neg1);
if (memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
if (_mesa_memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
tmp1 = tmp0;
else
emit_arith( p, FP_OPCODE_MAD, tmp1, WRITEMASK_XYZW, 0,
@@ -1039,7 +1039,7 @@ static void create_new_program(struct state_key *key, GLcontext *ctx,
emit_arith( &p, FP_OPCODE_ADD, out, WRITEMASK_XYZ, 0, cf, s, undef );
emit_arith( &p, FP_OPCODE_MOV, out, WRITEMASK_W, 0, cf, undef, undef );
}
else if (memcmp(&cf, &out, sizeof(cf)) != 0) {
else if (_mesa_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).
*/
@@ -1093,7 +1093,7 @@ static void *search_cache( struct texenvprog_cache *cache,
struct texenvprog_cache *c;
for (c = cache; c; c = c->next) {
if (c->hash == hash && memcmp(c->key, key, keysize) == 0)
if (c->hash == hash && _mesa_memcmp(c->key, key, keysize) == 0)
return c->data;
}