On 02/10/2012 08:26 PM, Paul Berry wrote:
Commit 2e5a1a2 (intel: Convert from GLboolean to 'bool' from
stdbool.h.) converted the "specoffset" local variable (in
intel_tris.c) from a GLboolean to a bool.  However, GLboolean was the
wrong type for specoffset--it should have been a GLuint (to match the
declaration of specoffset in struct intel_context).

This patch changes specoffset to the proper type.

Fixes piglit test general/two-sided-lighting-separate-specular.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45917
---
  src/mesa/drivers/dri/i915/intel_tris.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c 
b/src/mesa/drivers/dri/i915/intel_tris.c
index 23de6ea..a36011a 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -663,7 +663,7 @@ do {                                                        
\
     struct intel_context *intel = intel_context(ctx);                  \
     GLuint color[n] = { 0, }, spec[n] = { 0, };                                
\
     GLuint coloroffset = intel->coloroffset;                                \
-   bool specoffset = intel->specoffset;                             \
+   GLuint specoffset = intel->specoffset;                           \
     (void) color; (void) spec; (void) coloroffset; (void) specoffset;

Hooray for stupid bugs!  This is why booleans != ints.

Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to