gallium/radeon: fix warnings
authorMarek Olšák <marek.olsak@amd.com>
Fri, 4 Apr 2014 17:36:30 +0000 (19:36 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 8 Apr 2014 23:45:16 +0000 (01:45 +0200)
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/radeonsi/si_state.c
src/gallium/winsys/radeon/drm/radeon_drm_bo.c

index 8ed636a6717f677851069a78410258cb860ed532..70c9cdf468a9b2e9cf7ed040be2b3bcc03b0aca3 100644 (file)
@@ -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. */
index 6c345ff3a4487d6db51521ed101a29980a1d16d4..d81354ebe8d21b7dcfb05cc1ebefb948924bcc2f 100644 (file)
@@ -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:
index 7dd5e7f6f752fc0274135dac54c41d2f4860693f..8242b600ae42b827917fdb77fb34f5c75c73b820 100644 (file)
@@ -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