Module: Mesa
Branch: master
Commit: a7d0c53ab89ca86b705014925214101f5bc4187f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7d0c53ab89ca86b705014925214101f5bc4187f
Author: Marek Olšák <marek.ol...@amd.com>
Date: Fri May 25 16:37:29 2018 -0400
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 <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
---
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 9a0935e21a..e4fc19eb5e 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);
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
