Mesa (master): gallium/radeon: fix warnings

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 5f7faff61bc3ebe80f262fac6f58225d8005631b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f7faff61bc3ebe80f262fac6f58225d8005631b

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Apr  4 19:36:30 2014 +0200

gallium/radeon: fix warnings

---

 src/gallium/drivers/r300/r300_screen.c        |    1 +
 src/gallium/drivers/radeonsi/si_state.c       |    2 +-
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 8ed636a..70c9cdf 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -170,6 +170,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
         case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
         case PIPE_CAP_TEXTURE_GATHER_SM5:
         case PIPE_CAP_TEXTURE_QUERY_LOD:
+        case PIPE_CAP_FAKE_SW_MSAA:
             return 0;
 
         /* SWTCL-only features. */
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 6c345ff..d81354e 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1705,7 +1705,7 @@ static void si_init_depth_surface(struct si_context *sctx,
 	unsigned macro_aspect, tile_split, stile_split, bankh, bankw, nbanks, pipe_config;
 	uint32_t z_info, s_info, db_depth_info;
 	uint64_t z_offs, s_offs;
-	uint32_t db_htile_data_base, db_htile_surface, pa_su_poly_offset_db_fmt_cntl;
+	uint32_t db_htile_data_base, db_htile_surface, pa_su_poly_offset_db_fmt_cntl = 0;
 
 	switch (sctx->framebuffer.state.zsbuf->texture->format) {
 	case PIPE_FORMAT_S8_UINT_Z24_UNORM:
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 7dd5e7f..8242b60 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -864,7 +864,7 @@ static struct pb_buffer *radeon_winsys_bo_from_handle(struct radeon_winsys *rws,
     struct drm_radeon_gem_busy args;
     int r;
     unsigned handle;
-    uint64_t size;
+    uint64_t size = 0;
 
     /* We must maintain a list of pairs <handle, bo>, so that we always return
      * the same BO for one particular handle. If we didn't do that and created