fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-20 01:30:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/mesa: fix assertion failures with 2101010 vertex formats

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2012-12-20 17:00:06 +01:00
parent d1818d6f68
commit ee351ea178
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/state_tracker/st_atom_array.c
View file

@ -403,9 +403,9 @@ setup_interleaved_attribs(const struct st_vertex_program *vp,
const GLuint mesaAttr = vp->index_to_input[attr];
const struct gl_client_array *array = arrays[mesaAttr];
unsigned src_offset = (unsigned) (array->Ptr - low_addr);
GLuint element_size = array->_ElementSize;
assert(element_size == array->Size * _mesa_sizeof_type(array->Type));
assert(array->_ElementSize ==
_mesa_bytes_per_vertex_attrib(array->Size, array->Type));
velements[attr].src_offset = src_offset;
velements[attr].instance_divisor = array->InstanceDivisor;
@ -474,7 +474,8 @@ setup_non_interleaved_attribs(struct st_context *st,
struct gl_buffer_object *bufobj = array->BufferObj;
GLsizei stride = array->StrideB;
assert(array->_ElementSize == array->Size * _mesa_sizeof_type(array->Type));
assert(array->_ElementSize ==
_mesa_bytes_per_vertex_attrib(array->Size, array->Type));
if (_mesa_is_bufferobj(bufobj)) {
/* Attribute data is in a VBO.