Mesa (master): i915: Silence unused parameter warnings

2018-01-25 Thread Ian Romanick 
Module: Mesa
Branch: master
Commit: f5b9c2a6e3a899dfd9f8b8908200a6ea25affa41
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5b9c2a6e3a899dfd9f8b8908200a6ea25affa41

Author: Ian Romanick 
Date:   Wed Jan  3 13:29:13 2018 -0800

i915: Silence unused parameter warnings

../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c: In function 
‘intel_alloc_window_storage’:
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:290:48: warning: 
unused parameter ‘ctx’ [-Wunused-parameter]
 intel_alloc_window_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
^~~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c: In function 
‘intel_nop_alloc_storage’:
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:303:74: warning: 
unused parameter ‘rb’ [-Wunused-parameter]
 intel_nop_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
  ^~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:304:32: warning: 
unused parameter ‘internalFormat’ [-Wunused-parameter]
 GLenum internalFormat, GLuint width, GLuint height)
^~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:304:55: warning: 
unused parameter ‘width’ [-Wunused-parameter]
 GLenum internalFormat, GLuint width, GLuint height)
   ^
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:304:69: warning: 
unused parameter ‘height’ [-Wunused-parameter]
 GLenum internalFormat, GLuint width, GLuint height)
 ^~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c: In function 
‘intel_bind_framebuffer’:
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:396:47: warning: 
unused parameter ‘fb’ [-Wunused-parameter]
struct gl_framebuffer *fb, struct gl_framebuffer 
*fbread)
   ^~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:396:74: warning: 
unused parameter ‘fbread’ [-Wunused-parameter]
struct gl_framebuffer *fb, struct gl_framebuffer 
*fbread)
  ^~
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c: In function 
‘intel_renderbuffer_update_wrapper’:
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:422:57: warning: 
unused parameter ‘intel’ [-Wunused-parameter]
 intel_renderbuffer_update_wrapper(struct intel_context *intel,
 ^
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c: In function 
‘intel_blit_framebuffer_with_blitter’:
../../SOURCE/master/src/mesa/drivers/dri/i915/intel_fbo.c:644:61: warning: 
unused parameter ‘filter’ [-Wunused-parameter]
 GLbitfield mask, GLenum filter)
 ^~

Signed-off-by: Ian Romanick 
Reviewed-by: Samuel Iglesias Gonsálvez 

---

 src/mesa/drivers/dri/i915/intel_fbo.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c 
b/src/mesa/drivers/dri/i915/intel_fbo.c
index 0fb2fcdda0..827a77f722 100644
--- a/src/mesa/drivers/dri/i915/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915/intel_fbo.c
@@ -287,7 +287,7 @@ intel_image_target_renderbuffer_storage(struct gl_context 
*ctx,
  * intel_process_dri2_buffer().
  */
 static GLboolean
-intel_alloc_window_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
+intel_alloc_window_storage(UNUSED struct gl_context *ctx, struct 
gl_renderbuffer *rb,
GLenum internalFormat, GLuint width, GLuint height)
 {
assert(rb->Name == 0);
@@ -300,8 +300,10 @@ intel_alloc_window_storage(struct gl_context * ctx, struct 
gl_renderbuffer *rb,
 
 /** Dummy function for gl_renderbuffer::AllocStorage() */
 static GLboolean
-intel_nop_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
-GLenum internalFormat, GLuint width, GLuint height)
+intel_nop_alloc_storage(UNUSED struct gl_context *ctx,
+UNUSED struct gl_renderbuffer *rb,
+UNUSED GLenum internalFormat,
+UNUSED GLuint width, UNUSED GLuint height)
 {
_mesa_problem(ctx, "intel_op_alloc_storage should never be called.");
return false;
@@ -393,7 +395,8 @@ intel_new_renderbuffer(struct gl_context * ctx, GLuint name)
  */
 static void
 intel_bind_framebuffer(struct gl_context * ctx, GLenum target,
-   struct gl_framebuffer *fb, struct gl_framebuffer 
*fbread)
+

Mesa (master): i915: Silence unused parameter warnings

2015-09-10 Thread Ian Romanick 
Module: Mesa
Branch: master
Commit: 04122312662b60d8a2d472ff6492960b4d923587
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=04122312662b60d8a2d472ff6492960b4d923587

Author: Ian Romanick 
Date:   Wed Sep  2 15:01:18 2015 -0700

i915: Silence unused parameter warnings

intel_mipmap_tree.c: In function 'old_intel_miptree_unmap_raw':
intel_mipmap_tree.c:726:51: warning: unused parameter 'intel' 
[-Wunused-parameter]
 intel_miptree_unmap_raw(struct intel_context *intel,
   ^

Signed-off-by: Ian Romanick 
Reviewed-by: Anuj Phogat 

---

 src/mesa/drivers/dri/i915/intel_mipmap_tree.c  |7 +++
 src/mesa/drivers/dri/i915/intel_mipmap_tree.h  |3 +--
 src/mesa/drivers/dri/i915/intel_tex_subimage.c |2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c 
b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
index 1aa06c1..0fcc2b1 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
@@ -723,8 +723,7 @@ intel_miptree_map_raw(struct intel_context *intel, struct 
intel_mipmap_tree *mt)
 }
 
 void
-intel_miptree_unmap_raw(struct intel_context *intel,
-struct intel_mipmap_tree *mt)
+intel_miptree_unmap_raw(struct intel_mipmap_tree *mt)
 {
drm_intel_bo_unmap(mt->region->bo);
 }
@@ -778,7 +777,7 @@ intel_miptree_unmap_gtt(struct intel_context *intel,
unsigned int level,
unsigned int slice)
 {
-   intel_miptree_unmap_raw(intel, mt);
+   intel_miptree_unmap_raw(mt);
 }
 
 static void
@@ -833,7 +832,7 @@ intel_miptree_unmap_blit(struct intel_context *intel,
 {
struct gl_context *ctx = >ctx;
 
-   intel_miptree_unmap_raw(intel, map->mt);
+   intel_miptree_unmap_raw(map->mt);
 
if (map->mode & GL_MAP_WRITE_BIT) {
   bool ok = intel_miptree_blit(intel,
diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h 
b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
index f6ed717..aab30ed 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
@@ -348,8 +348,7 @@ void i945_miptree_layout(struct intel_mipmap_tree *mt);
 void *intel_miptree_map_raw(struct intel_context *intel,
 struct intel_mipmap_tree *mt);
 
-void intel_miptree_unmap_raw(struct intel_context *intel,
- struct intel_mipmap_tree *mt);
+void intel_miptree_unmap_raw(struct intel_mipmap_tree *mt);
 
 void
 intel_miptree_map(struct intel_context *intel,
diff --git a/src/mesa/drivers/dri/i915/intel_tex_subimage.c 
b/src/mesa/drivers/dri/i915/intel_tex_subimage.c
index f11ef2e..4083d69 100644
--- a/src/mesa/drivers/dri/i915/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i915/intel_tex_subimage.c
@@ -102,7 +102,7 @@ intel_blit_texsubimage(struct gl_context * ctx,
   _mesa_error(ctx, GL_OUT_OF_MEMORY, "intelTexSubImage");
}
 
-   intel_miptree_unmap_raw(intel, temp_mt);
+   intel_miptree_unmap_raw(temp_mt);
 
bool ret;
 

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit