diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
| commit | b86e8562b1ddca2a8bc29f22a79451a041bf5293 (patch) | |
| tree | 60fead0638fce6922b4043767fa991ff1f0e3488 /mesalib/src/mesa/swrast/s_texcombine.c | |
| parent | 53192e17e55aa9ed3e3721bf4fdcb2b01a595202 (diff) | |
| download | vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.gz vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.bz2 vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.zip | |
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texcombine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index 2a323613e..9c745d118 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/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"); |