From a7d0c53ab89ca86b705014925214101f5bc4187f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 25 May 2018 16:37:29 -0400 Subject: [PATCH] st/mesa: fix assertion failures with GL_UNSIGNED_INT64_ARB (v2) Bindless texture handles can be passed via vertex attribs using this type. They use the double codepath, so don't use st_pipe_vertex_format. Cc: 18.0 18.1 Reviewed-by: Ilia Mirkin --- src/mesa/state_tracker/st_atom_array.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c index 9a0935e21a5..e4fc19eb5e2 100644 --- a/src/mesa/state_tracker/st_atom_array.c +++ b/src/mesa/state_tracker/st_atom_array.c @@ -324,7 +324,6 @@ static void init_velement_lowered(const struct st_vertex_program *vp, int src_offset, int instance_divisor, int vbo_index, int idx) { - const unsigned format = st_pipe_vertex_format(attrib); const GLubyte nr_components = attrib->Size; if (attrib->Doubles) { @@ -358,6 +357,8 @@ static void init_velement_lowered(const struct st_vertex_program *vp, } } } else { + const unsigned format = st_pipe_vertex_format(attrib); + init_velement(&velements[idx], src_offset, format, instance_divisor, vbo_index); } -- 2.30.2