[Mesa-dev] [PATCH 10/20] intel: Silence several "warning: unused parameter"
Ian Romanick
idr at freedesktop.org
Mon Aug 29 14:59:00 PDT 2011
From: Ian Romanick <ian.d.romanick at intel.com>
The internalFormat, format, and type parameters were not used by
either try_pbo_upload or try_pbo_zcopy, so remove them. The width
parameter was also not used by try_pbo_zcopy (because it doesn't
actually copy anything), so remove it too.
---
src/mesa/drivers/dri/intel/intel_tex_image.c | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 2bbd952..2ef5d55 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -160,9 +160,7 @@ static GLboolean
try_pbo_upload(struct intel_context *intel,
struct intel_texture_image *intelImage,
const struct gl_pixelstore_attrib *unpack,
- GLint internalFormat,
- GLint width, GLint height,
- GLenum format, GLenum type, const void *pixels)
+ GLint width, GLint height, const void *pixels)
{
struct intel_buffer_object *pbo = intel_buffer_object(unpack->BufferObj);
GLuint src_offset, src_stride;
@@ -220,9 +218,7 @@ static GLboolean
try_pbo_zcopy(struct intel_context *intel,
struct intel_texture_image *intelImage,
const struct gl_pixelstore_attrib *unpack,
- GLint internalFormat,
- GLint width, GLint height,
- GLenum format, GLenum type, const void *pixels)
+ GLint width, const void *pixels)
{
struct intel_buffer_object *pbo = intel_buffer_object(unpack->BufferObj);
GLuint src_offset, src_stride;
@@ -466,10 +462,7 @@ intelTexImage(struct gl_context * ctx,
intelObj->mt->first_level == level &&
intelObj->mt->last_level == level) {
- if (try_pbo_zcopy(intel, intelImage, unpack,
- internalFormat,
- width, height, format, type, pixels)) {
-
+ if (try_pbo_zcopy(intel, intelImage, unpack, width, pixels)) {
DBG("pbo zcopy upload succeeded\n");
return;
}
@@ -478,9 +471,7 @@ intelTexImage(struct gl_context * ctx,
/* Otherwise, attempt to use the blitter for PBO image uploads.
*/
- if (try_pbo_upload(intel, intelImage, unpack,
- internalFormat,
- width, height, format, type, pixels)) {
+ if (try_pbo_upload(intel, intelImage, unpack, width, height, pixels)) {
DBG("pbo upload succeeded\n");
return;
}
--
1.7.4.4
More information about the mesa-dev
mailing list