summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_texcombine.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-09-01 07:47:24 -0600
committerBrian Paul <[email protected]>2012-09-01 07:47:24 -0600
commit33bb8c051df3f2561c7b4a5ad7abefa3fce99d37 (patch)
treea41341f3c9608a1540f9b26ab8eb9039d9aa09ac /src/mesa/swrast/s_texcombine.c
parent66d6ba2d83255e2fe051760faf8256e897af5a64 (diff)
mesa: s/MALLOC/malloc/
v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/swrast/s_texcombine.c')
-rw-r--r--src/mesa/swrast/s_texcombine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 2a323613ea8..9c745d1183b 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -611,7 +611,7 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
* thread.
*/
swrast->TexelBuffer =
- (GLfloat *) MALLOC(ctx->Const.MaxTextureImageUnits * maxThreads *
+ (GLfloat *) malloc(ctx->Const.MaxTextureImageUnits * maxThreads *
SWRAST_MAX_WIDTH * 4 * sizeof(GLfloat));
if (!swrast->TexelBuffer) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine");