diff options
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/bitset.h | 4 | ||||
-rw-r--r-- | src/mesa/main/ffvertex_prog.c | 2 | ||||
-rw-r--r-- | src/mesa/main/imports.c | 11 | ||||
-rw-r--r-- | src/mesa/main/imports.h | 5 | ||||
-rw-r--r-- | src/mesa/main/renderbuffer.c | 4 | ||||
-rw-r--r-- | src/mesa/main/texcompress_fxt1.c | 4 | ||||
-rw-r--r-- | src/mesa/main/texenvprogram.c | 2 |
7 files changed, 9 insertions, 23 deletions
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h index 5463c0a3c9..29468e8486 100644 --- a/src/mesa/main/bitset.h +++ b/src/mesa/main/bitset.h @@ -49,8 +49,8 @@ */ #define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) ) #define BITSET_EQUAL(x, y) (_mesa_memcmp( (x), (y), sizeof (x) ) == 0) -#define BITSET_ZERO(x) _mesa_memset( (x), 0, sizeof (x) ) -#define BITSET_ONES(x) _mesa_memset( (x), 0xff, sizeof (x) ) +#define BITSET_ZERO(x) memset( (x), 0, sizeof (x) ) +#define BITSET_ONES(x) memset( (x), 0xff, sizeof (x) ) #define BITSET_BITWORD(b) ((b) / BITSET_WORDBITS) #define BITSET_BIT(b) (1 << ((b) % BITSET_WORDBITS)) diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 867a55242c..48edec657b 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -1590,7 +1590,7 @@ create_new_program( const struct state_key *key, { struct tnl_program p; - _mesa_memset(&p, 0, sizeof(p)); + memset(&p, 0, sizeof(p)); p.state = key; p.program = program; p.eye_position = undef; diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 0abdfca381..d8375bf572 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -244,17 +244,6 @@ _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize) return newBuffer; } -/** Wrapper around memset() */ -void -_mesa_memset( void *dst, int val, size_t n ) -{ -#if defined(SUNOS4) - memset( (char *) dst, (int) val, (int) n ); -#else - memset(dst, val, n); -#endif -} - /** * Fill memory with a constant 16bit word. * \param dst destination pointer. diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 8f13d518ea..68d2043c91 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -74,7 +74,7 @@ extern "C" { /** Copy \p BYTES bytes from \p SRC into \p DST */ #define MEMCPY( DST, SRC, BYTES) memcpy(DST, SRC, BYTES) /** Set \p N bytes in \p DST to \p VAL */ -#define MEMSET( DST, VAL, N ) _mesa_memset(DST, VAL, N) +#define MEMSET( DST, VAL, N ) memset(DST, VAL, N) /*@}*/ @@ -544,9 +544,6 @@ extern void * _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize ); extern void -_mesa_memset( void *dst, int val, size_t n ); - -extern void _mesa_memset16( unsigned short *dst, unsigned short val, size_t n ); extern void diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c index 4ae5843662..bb0c78382c 100644 --- a/src/mesa/main/renderbuffer.c +++ b/src/mesa/main/renderbuffer.c @@ -548,7 +548,7 @@ put_mono_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count, ASSERT(rb->DataType == GL_UNSIGNED_BYTE); if (!mask && val0 == val1 && val1 == val2) { /* optimized case */ - _mesa_memset(dst, val0, 3 * count); + memset(dst, val0, 3 * count); } else { GLuint i; @@ -1319,7 +1319,7 @@ put_mono_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count, } } else { - _mesa_memset(dst, val, count); + memset(dst, val, count); } } diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index 85becb80d2..73a31a17ec 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -406,7 +406,7 @@ fxt1_choose (GLfloat vec[][MAX_COMP], GLint nv, } hist[N_TEXELS]; GLint lenh = 0; - _mesa_memset(hist, 0, sizeof(hist)); + memset(hist, 0, sizeof(hist)); for (k = 0; k < n; k++) { GLint l; @@ -1211,7 +1211,7 @@ fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps) if (comps == 3) { /* make the whole block opaque */ - _mesa_memset(input, -1, sizeof(input)); + memset(input, -1, sizeof(input)); } /* 8 texels each line */ diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 5cc5fdaebd..35a2cebab8 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -1416,7 +1416,7 @@ create_new_program(GLcontext *ctx, struct state_key *key, GLuint unit; struct ureg cf, out; - _mesa_memset(&p, 0, sizeof(p)); + memset(&p, 0, sizeof(p)); p.state = key; p.program = program; |