diff options
| author | Paul Berry <stereotype441@gmail.com> | 2012-02-10 19:51:55 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2012-02-14 11:40:02 -0800 |
| commit | 6b0a07f9ce844a8a96e2583bd37ed8453bf151c6 (patch) | |
| tree | 735623b2307d58c1e03d76ff1b71e0a915fb9d62 | |
| parent | 93831a54c7d4e74f353e0029164b1b3262e98806 (diff) | |
i915: Fix type of "specoffset" variable.
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.
This is a candidate for stable branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45917
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | 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 23de6ea943b..a36011a2769 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; |