intel: Silence "intel/intel_fbo.h:105:4: warning: comparison of unsigned expression...
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 26 Aug 2011 17:53:43 +0000 (10:53 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 9 Sep 2011 19:01:51 +0000 (12:01 -0700)
The test was of an enum, attIndex, which should be unsigned.  The
explicit check for < 0 was replaced with a cast to unsigned in an
assertion that attIndex is less than the size of the array it will be
used to index.

Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/drivers/dri/intel/intel_fbo.h

index 2487994fde5f211c7f77304b399cccb96aee6bf3..e12d0fdab9c7737ecdf3d785548b64381965d724 100644 (file)
@@ -29,7 +29,9 @@
 #define INTEL_FBO_H
 
 #include <stdbool.h>
+#include <assert.h>
 #include "main/formats.h"
+#include "intel_context.h"
 #include "intel_screen.h"
 
 struct intel_context;
@@ -101,9 +103,7 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex)
    struct gl_renderbuffer *rb;
    struct intel_renderbuffer *irb;
 
-   /* XXX: Who passes -1 to intel_get_renderbuffer? */
-   if (attIndex < 0)
-      return NULL;
+   assert((unsigned)attIndex < ARRAY_SIZE(fb->Attachment));
 
    rb = fb->Attachment[attIndex].Renderbuffer;
    if (!rb)