Mesa (master): intel: Fix compiler warnings from winsys msaa.

Eric Anholt anholt at kemper.freedesktop.org
Tue Aug 7 18:47:40 UTC 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug  7 11:33:10 2012 -0700

intel: Fix compiler warnings from winsys msaa.

---

 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp |    2 --
 src/mesa/drivers/dri/intel/intel_screen.c    |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 53b72f6..1e49ac5 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -146,8 +146,6 @@ do_blorp_blit(struct intel_context *intel, GLbitfield buffer_bit,
               GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
               bool mirror_x, bool mirror_y)
 {
-   struct gl_context *ctx = &intel->ctx;
-
    /* Find source/dst miptrees */
    struct intel_mipmap_tree *src_mt = find_miptree(buffer_bit, src_rb);
    struct intel_mipmap_tree *dst_mt = find_miptree(buffer_bit, dst_rb);
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 5c38c8d..088fd61 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -918,7 +918,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
 
       __DRIconfig **new_configs;
       const int num_depth_stencil_bits = 2;
-      int num_msaa_modes;
+      int num_msaa_modes = 0;
 
       depth_bits[0] = 0;
       stencil_bits[0] = 0;




More information about the mesa-commit mailing list