Mesa (master): intel: Silence "intel/intel_fbo.h:105:4: warning: comparison of unsigned expression < 0 is always false"
Ian Romanick
idr at kemper.freedesktop.org
Fri Sep 9 19:20:29 UTC 2011
Module: Mesa
Branch: master
Commit: 1a8111aea43b714609a20c1cb841ca58ae10dd83
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a8111aea43b714609a20c1cb841ca58ae10dd83
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 26 10:53:43 2011 -0700
intel: Silence "intel/intel_fbo.h:105:4: warning: comparison of unsigned expression < 0 is always false"
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 at anholt.net>
---
src/mesa/drivers/dri/intel/intel_fbo.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.h b/src/mesa/drivers/dri/intel/intel_fbo.h
index 2487994..e12d0fd 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.h
+++ b/src/mesa/drivers/dri/intel/intel_fbo.h
@@ -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)
More information about the mesa-commit
mailing list