diff options
| author | Mathias Fröhlich <[email protected]> | 2018-01-27 16:07:22 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-02-01 22:39:06 +0100 |
| commit | 186f03cfb021223f0a6f238da036517fbf240d26 (patch) | |
| tree | e308ff5b580813d04e7d0794a80bee2a26fe1159 /src/compiler | |
| parent | 38b41fd718cfffd11dab637d9d0cbd6c2a30b2c2 (diff) | |
mesa: Put materials at the end of the generic block.
The materials are now moved to the end of the
generic attributes block to the range 4-15.
Before, the way the position and generic 0 attribute
is handled was dependent on the presence and kind of
the currently attached vertex program. With this
change the way the position attribute and the generic 0
attribute is treated only depends on the enabled
flag of those two arrays.
This will later help to untangle the update dependencies
between enabled arrays and shader inputs.
v2: s,VERT_ATTRIB_MAT_OFFSET,VERT_ATTRIB_MAT0,g
Signed-off-by: Mathias Fröhlich <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/shader_enums.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index aa296adb5a1..fb78ad384cb 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -127,6 +127,8 @@ const char *gl_vert_attrib_name(gl_vert_attrib attrib); * VERT_ATTRIB_MAT * include the generic shader attributes used to alias * varying material values for the TNL shader programs. + * They are located at the end of the generic attribute + * block not to overlap with the generic 0 attribute. */ #define VERT_ATTRIB_FF(i) (VERT_ATTRIB_POS + (i)) #define VERT_ATTRIB_FF_MAX VERT_ATTRIB_GENERIC0 @@ -137,7 +139,10 @@ const char *gl_vert_attrib_name(gl_vert_attrib attrib); #define VERT_ATTRIB_GENERIC(i) (VERT_ATTRIB_GENERIC0 + (i)) #define VERT_ATTRIB_GENERIC_MAX MAX_VERTEX_GENERIC_ATTRIBS -#define VERT_ATTRIB_MAT(i) VERT_ATTRIB_GENERIC(i) +#define VERT_ATTRIB_MAT0 \ + (VERT_ATTRIB_GENERIC_MAX - VERT_ATTRIB_MAT_MAX) +#define VERT_ATTRIB_MAT(i) \ + VERT_ATTRIB_GENERIC((i) + VERT_ATTRIB_MAT0) #define VERT_ATTRIB_MAT_MAX MAT_ATTRIB_MAX /** |