diff options
| author | Ian Romanick <[email protected]> | 2013-12-16 19:07:24 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-02-11 14:36:43 -0800 |
| commit | d156281cfe8f2ceeb562afda4984972028a74e86 (patch) | |
| tree | be171aca3c9cb31c527905d51040585c8742a467 | |
| parent | f34d599a5b86fe05be22201e7cf279d5578feb7f (diff) | |
meta: Silence unused parameter warning in setup_drawpix_texture
drivers/common/meta.c: In function 'setup_drawpix_texture':
drivers/common/meta.c:1572:30: warning: unused parameter 'texIntFormat' [-Wunused-parameter]
setup_drawpix_texture has never used this paramater. Before the
refactor commit 04f8193aa it was used in several locations. After that
commit, texIntFormat was only used in alloc_texture.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index cdff9902de4..566e598c02f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1467,7 +1467,6 @@ static void setup_drawpix_texture(struct gl_context *ctx, struct temp_texture *tex, GLboolean newTex, - GLenum texIntFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels) @@ -1980,7 +1979,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, newTex = alloc_texture(depthTex, srcW, srcH, GL_DEPTH_COMPONENT); _mesa_ReadPixels(srcX, srcY, srcW, srcH, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); - setup_drawpix_texture(ctx, depthTex, newTex, GL_DEPTH_COMPONENT, + setup_drawpix_texture(ctx, depthTex, newTex, srcW, srcH, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); @@ -2838,7 +2837,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, if (!drawpix->StencilFP) init_draw_stencil_pixels(ctx); - setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height, + setup_drawpix_texture(ctx, tex, newTex, width, height, GL_ALPHA, type, pixels); _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); @@ -2881,14 +2880,14 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, ctx->Current.RasterColor); - setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height, + setup_drawpix_texture(ctx, tex, newTex, width, height, format, type, pixels); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); } else { /* Drawing RGBA */ - setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height, + setup_drawpix_texture(ctx, tex, newTex, width, height, format, type, pixels); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); } @@ -3072,7 +3071,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE); _mesa_AlphaFunc(GL_NOTEQUAL, UBYTE_TO_FLOAT(bg)); - setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height, + setup_drawpix_texture(ctx, tex, newTex, width, height, GL_ALPHA, GL_UNSIGNED_BYTE, bitmap8); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); |