diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
| commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
| tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/mesa/swrast/s_texcombine.c | |
| parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
| download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip | |
xserver mesa git update 6 sep 2012
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texcombine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index 9c745d118..1a2db35e2 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/src/mesa/swrast/s_texcombine.c @@ -98,14 +98,14 @@ texture_combine( struct gl_context *ctx, GLuint unit, GLchan (*rgbaChan)[4] = span->array->rgba; /* alloc temp pixel buffers */ - rgba = (float4_array) malloc(4 * n * sizeof(GLfloat)); + rgba = malloc(4 * n * sizeof(GLfloat)); if (!rgba) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine"); return; } for (i = 0; i < numArgsRGB || i < numArgsA; i++) { - ccolor[i] = (float4_array) malloc(4 * n * sizeof(GLfloat)); + ccolor[i] = malloc(4 * n * sizeof(GLfloat)); if (!ccolor[i]) { while (i) { free(ccolor[i]); @@ -611,7 +611,7 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span ) * thread. */ swrast->TexelBuffer = - (GLfloat *) malloc(ctx->Const.MaxTextureImageUnits * maxThreads * + malloc(ctx->Const.MaxTextureImageUnits * maxThreads * SWRAST_MAX_WIDTH * 4 * sizeof(GLfloat)); if (!swrast->TexelBuffer) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine"); @@ -619,7 +619,7 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span ) } } - primary_rgba = (float4_array) malloc(span->end * 4 * sizeof(GLfloat)); + primary_rgba = malloc(span->end * 4 * sizeof(GLfloat)); if (!primary_rgba) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_span"); |