From 84a076079d3a038115a39b1c283b46a574591e07 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 14 Dec 2007 12:52:17 -0800
Subject: [PATCH] [intel] warnings cleanup

---
 src/mesa/drivers/dri/i965/brw_draw_upload.c   | 13 -------------
 src/mesa/drivers/dri/i965/brw_wm.h            |  2 +-
 src/mesa/drivers/dri/i965/brw_wm_glsl.c       |  2 +-
 src/mesa/drivers/dri/i965/intel_buffers.c     |  2 +-
 src/mesa/drivers/dri/i965/intel_ioctl.c       | 11 -----------
 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c |  3 +--
 6 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index c0da290d5c8..539a6ecc5a6 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -555,19 +555,6 @@ GLboolean brw_upload_vertices( struct brw_context *brw,
    return GL_TRUE;
 }
 
-
-static GLuint element_size( GLenum type )
-{
-   switch(type) {
-   case GL_UNSIGNED_INT: return 4;
-   case GL_UNSIGNED_SHORT: return 2;
-   case GL_UNSIGNED_BYTE: return 1;
-   default: assert(0); return 0;
-   }
-}
-
-
-
 void brw_upload_indices( struct brw_context *brw,
 			 const struct _mesa_index_buffer *index_buffer )
 {
diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h
index 440b5357d5a..d4eb2330b7a 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@ -269,6 +269,6 @@ void brw_wm_lookup_iz( GLuint line_aa,
 		       GLuint lookup,
 		       struct brw_wm_prog_key *key );
 
-GLboolean brw_wm_is_glsl(struct gl_fragment_program *fp);
+GLboolean brw_wm_is_glsl(const struct gl_fragment_program *fp);
 void brw_wm_glsl_emit(struct brw_wm_compile *c);
 #endif
diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index e738086fefb..1ca5c67a0b0 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -5,7 +5,7 @@
 #include "brw_wm.h"
 
 /* Only guess, need a flag in gl_fragment_program later */
-GLboolean brw_wm_is_glsl(struct gl_fragment_program *fp)
+GLboolean brw_wm_is_glsl(const struct gl_fragment_program *fp)
 {
     int i;
     for (i = 0; i < fp->Base.NumInstructions; i++) {
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
index 406aa93d06d..2567b361201 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.c
+++ b/src/mesa/drivers/dri/i965/intel_buffers.c
@@ -194,7 +194,7 @@ void intelWindowMoved( struct intel_context *intel )
 
    /* Get updated plane info so we sync against the right vblank counter */
    if (intel->intelScreen->driScrnPriv->ddx_version.minor >= 7) {
-      drmI830Sarea *sarea = intel->sarea;
+      volatile drmI830Sarea *sarea = intel->sarea;
       drm_clip_rect_t drw_rect = { .x1 = dPriv->x, .x2 = dPriv->x + dPriv->w,
 				   .y1 = dPriv->y, .y2 = dPriv->y + dPriv->h };
       drm_clip_rect_t planeA_rect = { .x1 = sarea->planeA_x, .y1 = sarea->planeA_y,
diff --git a/src/mesa/drivers/dri/i965/intel_ioctl.c b/src/mesa/drivers/dri/i965/intel_ioctl.c
index 91677c0c52f..c6633e81c1c 100644
--- a/src/mesa/drivers/dri/i965/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i965/intel_ioctl.c
@@ -45,17 +45,6 @@
 #include "intel_bufmgr_ttm.h"
 #include "i915_drm.h"
 
-static void intelWaitIdleLocked( struct intel_context *intel )
-{
-   unsigned int fence;
-
-   if (INTEL_DEBUG & DEBUG_SYNC)
-      fprintf(stderr, "waiting for idle\n");
-
-   fence = intelEmitIrqLocked(intel);
-   intelWaitIrq(intel, fence);
-}
-
 int intelEmitIrqLocked( struct intel_context *intel )
 {
    int seq = 1;
diff --git a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
index ed683d19aeb..e1eb9f34ae1 100644
--- a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
+++ b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
@@ -304,7 +304,7 @@ intel_setup_reloc_list(dri_bo *bo)
      * at the last intel_free_validate_list().
      */
     if (bo_ttm->reloc_buf != NULL)
-       return;
+       return 0;
 
     bo_ttm->reloc_buf = malloc(sizeof(bo_ttm->drm_bo));
 
@@ -459,7 +459,6 @@ intel_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name,
 static void
 dri_ttm_bo_reference(dri_bo *buf)
 {
-    dri_bufmgr_ttm *bufmgr_ttm = (dri_bufmgr_ttm *)buf->bufmgr;
     dri_bo_ttm *ttm_buf = (dri_bo_ttm *)buf;
 
     ttm_buf->refcount++;
-- 
2.30.2