[Mesa-dev] [PATCH 04/20] intel: Silence several "warning: unused parameter"
Ian Romanick
idr at freedesktop.org
Mon Aug 29 14:58:54 PDT 2011
From: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/dri/intel/intel_buffer_objects.c | 47 ++++++++++++++-------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index d908975..0acc3a1 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -151,6 +151,12 @@ intel_bufferobj_data(struct gl_context * ctx,
struct intel_context *intel = intel_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
+ /* Part of the ABI, but this function doesn't use it.
+ */
+#ifndef I915
+ (void) target;
+#endif
+
intel_obj->Base.Size = size;
intel_obj->Base.Usage = usage;
@@ -743,9 +749,7 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx,
#if FEATURE_APPLE_object_purgeable
static GLenum
-intel_buffer_purgeable(struct gl_context * ctx,
- drm_intel_bo *buffer,
- GLenum option)
+intel_buffer_purgeable(drm_intel_bo *buffer)
{
int retained = 0;
@@ -764,7 +768,7 @@ intel_buffer_object_purgeable(struct gl_context * ctx,
intel = intel_buffer_object (obj);
if (intel->buffer != NULL)
- return intel_buffer_purgeable (ctx, intel->buffer, option);
+ return intel_buffer_purgeable(intel->buffer);
if (option == GL_RELEASED_APPLE) {
if (intel->sys_buffer != NULL) {
@@ -775,10 +779,8 @@ intel_buffer_object_purgeable(struct gl_context * ctx,
return GL_RELEASED_APPLE;
} else {
/* XXX Create the buffer and madvise(MADV_DONTNEED)? */
- return intel_buffer_purgeable (ctx,
- intel_bufferobj_buffer(intel_context(ctx),
- intel, INTEL_READ),
- option);
+ return intel_buffer_purgeable(intel_bufferobj_buffer(intel_context(ctx),
+ intel, INTEL_READ));
}
}
@@ -789,11 +791,14 @@ intel_texture_object_purgeable(struct gl_context * ctx,
{
struct intel_texture_object *intel;
+ (void) ctx;
+ (void) option;
+
intel = intel_texture_object(obj);
if (intel->mt == NULL || intel->mt->region == NULL)
return GL_RELEASED_APPLE;
- return intel_buffer_purgeable (ctx, intel->mt->region->buffer, option);
+ return intel_buffer_purgeable(intel->mt->region->buffer);
}
static GLenum
@@ -803,17 +808,18 @@ intel_render_object_purgeable(struct gl_context * ctx,
{
struct intel_renderbuffer *intel;
+ (void) ctx;
+ (void) option;
+
intel = intel_renderbuffer(obj);
if (intel->region == NULL)
return GL_RELEASED_APPLE;
- return intel_buffer_purgeable (ctx, intel->region->buffer, option);
+ return intel_buffer_purgeable(intel->region->buffer);
}
static GLenum
-intel_buffer_unpurgeable(struct gl_context * ctx,
- drm_intel_bo *buffer,
- GLenum option)
+intel_buffer_unpurgeable(drm_intel_bo *buffer)
{
int retained;
@@ -829,7 +835,10 @@ intel_buffer_object_unpurgeable(struct gl_context * ctx,
struct gl_buffer_object *obj,
GLenum option)
{
- return intel_buffer_unpurgeable (ctx, intel_buffer_object (obj)->buffer, option);
+ (void) ctx;
+ (void) option;
+
+ return intel_buffer_unpurgeable(intel_buffer_object (obj)->buffer);
}
static GLenum
@@ -839,11 +848,14 @@ intel_texture_object_unpurgeable(struct gl_context * ctx,
{
struct intel_texture_object *intel;
+ (void) ctx;
+ (void) option;
+
intel = intel_texture_object(obj);
if (intel->mt == NULL || intel->mt->region == NULL)
return GL_UNDEFINED_APPLE;
- return intel_buffer_unpurgeable (ctx, intel->mt->region->buffer, option);
+ return intel_buffer_unpurgeable(intel->mt->region->buffer);
}
static GLenum
@@ -853,11 +865,14 @@ intel_render_object_unpurgeable(struct gl_context * ctx,
{
struct intel_renderbuffer *intel;
+ (void) ctx;
+ (void) option;
+
intel = intel_renderbuffer(obj);
if (intel->region == NULL)
return GL_UNDEFINED_APPLE;
- return intel_buffer_unpurgeable (ctx, intel->region->buffer, option);
+ return intel_buffer_unpurgeable(intel->region->buffer);
}
#endif
--
1.7.4.4
More information about the mesa-dev
mailing list