Hi Brian, One nit if you want below.
Either way: Reviewed-by: Mathias Fröhlich <mathias.froehl...@web.de> best Mathias On Thursday, 10 May 2018 03:51:04 CEST Brian Paul wrote: [...] > diff --git a/src/mesa/main/get_hash_params.py > b/src/mesa/main/get_hash_params.py > index de5fed6..755d33a 100644 > --- a/src/mesa/main/get_hash_params.py > +++ b/src/mesa/main/get_hash_params.py > @@ -212,20 +212,20 @@ descriptor=[ > [ "TEXTURE_MATRIX", "LOC_CUSTOM, TYPE_MATRIX, 0, extra_valid_texture_unit" > ], > [ "TEXTURE_STACK_DEPTH", "LOC_CUSTOM, TYPE_INT, 0, > extra_valid_texture_unit" ], > [ "VERTEX_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_POS].Enabled), > NO_EXTRA" ], > - [ "VERTEX_ARRAY_SIZE", "ARRAY_INT(VertexAttrib[VERT_ATTRIB_POS].Size), > NO_EXTRA" ], > + [ "VERTEX_ARRAY_SIZE", "ARRAY_UBYTE(VertexAttrib[VERT_ATTRIB_POS].Size), > NO_EXTRA" ], > [ "VERTEX_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_POS].Type), > NO_EXTRA" ], > - [ "VERTEX_ARRAY_STRIDE", "ARRAY_INT(VertexAttrib[VERT_ATTRIB_POS].Stride), > NO_EXTRA" ], > + [ "VERTEX_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_POS].Stride), NO_EXTRA" ], > [ "NORMAL_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_NORMAL].Enabled), > NO_EXTRA" ], > [ "NORMAL_ARRAY_TYPE", > "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_NORMAL].Type), NO_EXTRA" ], > - [ "NORMAL_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_NORMAL].Stride), NO_EXTRA" ], > + [ "NORMAL_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_NORMAL].Stride), NO_EXTRA" ], > [ "COLOR_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_COLOR0].Enabled), > NO_EXTRA" ], > [ "COLOR_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], You may want to change the type for COLOR_ARRAY_SIZE also to TYPE_UBYTE. It's not used in the custom location code, but to be consistent. > [ "COLOR_ARRAY_TYPE", > "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_COLOR0].Type), NO_EXTRA" ], > - [ "COLOR_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_COLOR0].Stride), NO_EXTRA" ], > + [ "COLOR_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_COLOR0].Stride), NO_EXTRA" ], > [ "TEXTURE_COORD_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct > gl_array_attributes, Enabled), NO_EXTRA" ], > - [ "TEXTURE_COORD_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, offsetof(struct > gl_array_attributes, Size), NO_EXTRA" ], > + [ "TEXTURE_COORD_ARRAY_SIZE", "LOC_CUSTOM, TYPE_UBYTE, offsetof(struct > gl_array_attributes, Size), NO_EXTRA" ], > [ "TEXTURE_COORD_ARRAY_TYPE", "LOC_CUSTOM, TYPE_ENUM16, offsetof(struct > gl_array_attributes, Type), NO_EXTRA" ], > - [ "TEXTURE_COORD_ARRAY_STRIDE", "LOC_CUSTOM, TYPE_INT, offsetof(struct > gl_array_attributes, Stride), NO_EXTRA" ], > + [ "TEXTURE_COORD_ARRAY_STRIDE", "LOC_CUSTOM, TYPE_SHORT, offsetof(struct > gl_array_attributes, Stride), NO_EXTRA" ], > > # GL_ARB_multitexture > [ "MAX_TEXTURE_UNITS", "CONTEXT_INT(Const.MaxTextureUnits), NO_EXTRA" ], > @@ -255,7 +255,7 @@ descriptor=[ > # OES_point_size_array > [ "POINT_SIZE_ARRAY_OES", > "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN), > NO_EXTRA" ], > [ "POINT_SIZE_ARRAY_TYPE_OES", > "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM16), > NO_EXTRA" ], > - [ "POINT_SIZE_ARRAY_STRIDE_OES", > "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Stride, TYPE_INT), > NO_EXTRA" ], > + [ "POINT_SIZE_ARRAY_STRIDE_OES", > "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Stride, TYPE_SHORT), > NO_EXTRA" ], > [ "POINT_SIZE_ARRAY_BUFFER_BINDING_OES", "LOC_CUSTOM, TYPE_INT, 0, > NO_EXTRA" ], > ]}, > > @@ -790,11 +790,11 @@ descriptor=[ > [ "COLOR_ARRAY_COUNT_EXT", "CONST(0), NO_EXTRA" ], > [ "INDEX_ARRAY", > "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled), NO_EXTRA" ], > [ "INDEX_ARRAY_TYPE", > "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Type), NO_EXTRA" ], > - [ "INDEX_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Stride), NO_EXTRA" ], > + [ "INDEX_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Stride), NO_EXTRA" ], > [ "INDEX_ARRAY_COUNT_EXT", "CONST(0), NO_EXTRA" ], > [ "TEXTURE_COORD_ARRAY_COUNT_EXT", "CONST(0), NO_EXTRA" ], > [ "EDGE_FLAG_ARRAY", > "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled), NO_EXTRA" ], > - [ "EDGE_FLAG_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_EDGEFLAG].Stride), NO_EXTRA" ], > + [ "EDGE_FLAG_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_EDGEFLAG].Stride), NO_EXTRA" ], > [ "EDGE_FLAG_ARRAY_COUNT_EXT", "CONST(0), NO_EXTRA" ], > > # GL_ARB_texture_compression > @@ -824,14 +824,14 @@ descriptor=[ > [ "CURRENT_SECONDARY_COLOR", > "CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR1][0], TYPE_FLOATN_4), > extra_flush_current" ], > [ "SECONDARY_COLOR_ARRAY", > "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_COLOR1].Enabled), NO_EXTRA" ], > [ "SECONDARY_COLOR_ARRAY_TYPE", > "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_COLOR1].Type), NO_EXTRA" ], > - [ "SECONDARY_COLOR_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_COLOR1].Stride), NO_EXTRA" ], > - [ "SECONDARY_COLOR_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], > + [ "SECONDARY_COLOR_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_COLOR1].Stride), NO_EXTRA" ], > + [ "SECONDARY_COLOR_ARRAY_SIZE", "LOC_CUSTOM, TYPE_UBYTE, 0, NO_EXTRA" ], > > # GL_EXT_fog_coord > [ "CURRENT_FOG_COORDINATE", > "CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_FOG][0]), extra_flush_current" ], > [ "FOG_COORDINATE_ARRAY", > "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_FOG].Enabled), NO_EXTRA" ], > [ "FOG_COORDINATE_ARRAY_TYPE", > "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_FOG].Type), NO_EXTRA" ], > - [ "FOG_COORDINATE_ARRAY_STRIDE", > "ARRAY_INT(VertexAttrib[VERT_ATTRIB_FOG].Stride), NO_EXTRA" ], > + [ "FOG_COORDINATE_ARRAY_STRIDE", > "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_FOG].Stride), NO_EXTRA" ], > [ "FOG_COORDINATE_SOURCE", "CONTEXT_ENUM16(Fog.FogCoordinateSource), > NO_EXTRA" ], > > # GL_NV_fog_distance > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
