From: Ian Romanick <ian.d.roman...@intel.com>
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.
---
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..d8fc1a5 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.h
+++ b/src/mesa/drivers/dri/intel/intel_fbo.h
@@ -29,6 +29,8 @@
#define INTEL_FBO_H
#include <stdbool.h>
+#include <assert.h>
+#include "main/compiler.h"
#include "main/formats.h"
#include "intel_screen.h"
@@ -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 < Elements(fb->Attachment));
rb = fb->Attachment[attIndex].Renderbuffer;
if (!rb)
--
1.7.4.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
