Mesa (master): swrast: init vars to silence warnings

Brian Paul brianp at kemper.freedesktop.org
Mon Mar 25 18:31:09 UTC 2013


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Mar 25 10:23:27 2013 -0600

swrast: init vars to silence warnings

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/mesa/swrast/s_blit.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 82fa43f..051354d 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -110,8 +110,8 @@ blit_nearest(struct gl_context *ctx,
              GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
              GLbitfield buffer)
 {
-   struct gl_renderbuffer *readRb, *drawRb;
-   struct gl_renderbuffer_attachment *readAtt, *drawAtt;
+   struct gl_renderbuffer *readRb, *drawRb = NULL;
+   struct gl_renderbuffer_attachment *readAtt = NULL, *drawAtt = NULL;
    struct gl_framebuffer *readFb = ctx->ReadBuffer;
    struct gl_framebuffer *drawFb = ctx->DrawBuffer;
    GLuint numDrawBuffers = 0;
@@ -135,12 +135,12 @@ blit_nearest(struct gl_context *ctx,
       UNPACK_Z_FLOAT,
       UNPACK_Z_INT,
       UNPACK_S,
-   } mode;
+   } mode = DIRECT;
    GLubyte *srcMap, *dstMap;
    GLint srcRowStride, dstRowStride;
    GLint dstRow;
 
-   GLint pixelSize;
+   GLint pixelSize = 0;
    GLvoid *srcBuffer, *dstBuffer;
    GLint prevY = -1;
 




More information about the mesa-commit mailing list