Attachment 53992 Details for Bug 43353 – Renumber tnl attributes patch.

[patch] Renumber tnl attributes patch.

vert-attrib-regression.diff (text/plain), 2.96 KB, created by Mathias Fröhlich on 2011-11-30 23:35:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathias Fröhlich

Created: 2011-11-30 23:35:17 UTC

Size: 2.96 KB

patch

obsolete

>diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
>index 7a0704b..bb8b5e6 100644
>--- a/src/mesa/main/bitset.h
>+++ b/src/mesa/main/bitset.h
>@@ -100,7 +100,7 @@ __bitset_ffs(const BITSET_WORD *x, int n)
>  * 64-bit bitset implementation
>  */
>  
>-#define BITSET64_WORD GLuint
>+#define BITSET64_WORD GLuint64
> #define BITSET64_WORDBITS (sizeof (BITSET64_WORD) * 8)
> 
> /* bitset declarations
>diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
>index a7e8c7c..36b1043 100644
>--- a/src/mesa/tnl/t_context.h
>+++ b/src/mesa/tnl/t_context.h
>@@ -93,22 +93,22 @@ enum {
> 	_TNL_ATTRIB_TEX6 = 14,
> 	_TNL_ATTRIB_TEX7 = 15,
> 
>-	_TNL_ATTRIB_GENERIC0 = 16, /* doesn't really exist! */
>-	_TNL_ATTRIB_GENERIC1 = 17,
>-	_TNL_ATTRIB_GENERIC2 = 18,
>-	_TNL_ATTRIB_GENERIC3 = 19,
>-	_TNL_ATTRIB_GENERIC4 = 20,
>-	_TNL_ATTRIB_GENERIC5 = 21,
>-	_TNL_ATTRIB_GENERIC6 = 22,
>-	_TNL_ATTRIB_GENERIC7 = 23,
>-	_TNL_ATTRIB_GENERIC8 = 24,
>-	_TNL_ATTRIB_GENERIC9 = 25,
>-	_TNL_ATTRIB_GENERIC10 = 26,
>-	_TNL_ATTRIB_GENERIC11 = 27,
>-	_TNL_ATTRIB_GENERIC12 = 28,
>-	_TNL_ATTRIB_GENERIC13 = 29,
>-	_TNL_ATTRIB_GENERIC14 = 30,
>-	_TNL_ATTRIB_GENERIC15 = 31,
>+	_TNL_ATTRIB_GENERIC0 = 17, /* doesn't really exist! */
>+	_TNL_ATTRIB_GENERIC1 = 18,
>+	_TNL_ATTRIB_GENERIC2 = 19,
>+	_TNL_ATTRIB_GENERIC3 = 20,
>+	_TNL_ATTRIB_GENERIC4 = 21,
>+	_TNL_ATTRIB_GENERIC5 = 22,
>+	_TNL_ATTRIB_GENERIC6 = 23,
>+	_TNL_ATTRIB_GENERIC7 = 24,
>+	_TNL_ATTRIB_GENERIC8 = 25,
>+	_TNL_ATTRIB_GENERIC9 = 26,
>+	_TNL_ATTRIB_GENERIC10 = 27,
>+	_TNL_ATTRIB_GENERIC11 = 28,
>+	_TNL_ATTRIB_GENERIC12 = 29,
>+	_TNL_ATTRIB_GENERIC13 = 30,
>+	_TNL_ATTRIB_GENERIC14 = 31,
>+	_TNL_ATTRIB_GENERIC15 = 32,
> 
> 	/* These alias with the generics, but they are not active
> 	 * concurrently, so it's not a problem.  The TNL module
>@@ -120,25 +120,25 @@ enum {
> 	 * generic attribute in order to pick up per-vertex material
> 	 * data.
> 	 */
>-	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 16,
>-	_TNL_ATTRIB_MAT_BACK_AMBIENT = 17,
>-	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 18,
>-	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 19,
>-	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 20,
>-	_TNL_ATTRIB_MAT_BACK_SPECULAR = 21,
>-	_TNL_ATTRIB_MAT_FRONT_EMISSION = 22,
>-	_TNL_ATTRIB_MAT_BACK_EMISSION = 23,
>-	_TNL_ATTRIB_MAT_FRONT_SHININESS = 24,
>-	_TNL_ATTRIB_MAT_BACK_SHININESS = 25,
>-	_TNL_ATTRIB_MAT_FRONT_INDEXES = 26,
>-	_TNL_ATTRIB_MAT_BACK_INDEXES = 27,
>+	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 17,
>+	_TNL_ATTRIB_MAT_BACK_AMBIENT = 18,
>+	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 19,
>+	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 20,
>+	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 21,
>+	_TNL_ATTRIB_MAT_BACK_SPECULAR = 22,
>+	_TNL_ATTRIB_MAT_FRONT_EMISSION = 23,
>+	_TNL_ATTRIB_MAT_BACK_EMISSION = 24,
>+	_TNL_ATTRIB_MAT_FRONT_SHININESS = 25,
>+	_TNL_ATTRIB_MAT_BACK_SHININESS = 26,
>+	_TNL_ATTRIB_MAT_FRONT_INDEXES = 27,
>+	_TNL_ATTRIB_MAT_BACK_INDEXES = 28,
> 
> 	/* This is really a VERT_RESULT, not an attrib.  Need to fix
> 	 * tnl to understand the difference.
> 	 */
> 	_TNL_ATTRIB_POINTSIZE = 16,
> 
>-	_TNL_ATTRIB_MAX = 32
>+	_TNL_ATTRIB_MAX = 33
> } ;
> 
> #define _TNL_ATTRIB_TEX(u)       (_TNL_ATTRIB_TEX0 + (u))

Actions: View | Splinter Review

Attachments on bug 43353: 53962 | 53992

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.