mesa: Fix vertex_format_to_pipe_format index.
Corrects the index into the vertex_formats table for `integer` and
`normalized` values other than 0 or 1.
Fixes: e6448f993b1 ("mesa: translate into gallium vertex formats in mesa/main")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7554>
(cherry picked from commit 9edb6e1be0f8ac65496e1f0da6c78376d81d70ff)
diff --git a/.pick_status.json b/.pick_status.json
index 633b570..509ff09 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -535,7 +535,7 @@
"description": "mesa: Fix vertex_format_to_pipe_format index.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "e6448f993b157a6d3757b69d5d4c2424e8af737e"
},
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 5c67afc..ec5d09e 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -459,8 +459,7 @@
*/
static enum pipe_format
vertex_format_to_pipe_format(GLubyte size, GLenum16 type, GLenum16 format,
- GLboolean normalized, GLboolean integer,
- GLboolean doubles)
+ bool normalized, bool integer, bool doubles)
{
assert(size >= 1 && size <= 4);
assert(format == GL_RGBA || format == GL_BGRA);
@@ -674,8 +673,8 @@
struct gl_vertex_array_object *vao,
GLuint attrib, GLbitfield legalTypesMask,
GLint sizeMin, GLint sizeMax,
- GLint size, GLenum type, GLboolean normalized,
- GLboolean integer, GLboolean doubles,
+ GLint size, GLenum type, bool normalized,
+ bool integer, bool doubles,
GLuint relativeOffset, GLenum format)
{
GLbitfield typeBit;