fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: Fix vertex_format_to_pipe_format index.

Browse source 
Corrects the index into the vertex_formats table for `integer` and
`normalized` values other than 0 or 1.

Fixes: e6448f993b ("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 9edb6e1be0)
This commit is contained in:
Brendan Dougherty 2020-11-11 11:26:39 -06:00 • committed by Dylan Baker
parent 7762b3cda4
commit 0e3bb4aa91
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

7
src/mesa/main/varray.c
View file

@ -459,8 +459,7 @@ static const uint16_t vertex_formats[][4][4] = {
*/
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 @@ validate_array_format(struct gl_context *ctx, const char *func,
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;