fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: allow unsourced enabled VAO

Browse source 
The GL 4.5 spec says:
    "If any enabled array’s buffer binding is zero when DrawArrays
    or one of the other drawing commands defined in section 10.4 is
    called, the result is undefined."

This commits avoids crashing the code, which is not a very good
"undefined result".

This fixes spec/!opengl 3.1/vao-broken-attrib piglit test.
This commit is contained in:
Juan A. Suarez Romero 2016-11-03 08:56:23 +01:00
parent 8801734da7
commit c32a9ec5f5
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/drivers/dri/i965/brw_draw_upload.c
View file

@ -423,13 +423,22 @@ copy_array_to_vbo_array(struct brw_context *brw,
uint8_t *dst = intel_upload_space(brw, size, dst_stride,
&buffer->bo, &buffer->offset);
if (dst_stride == src_stride) {
memcpy(dst, src, size);
} else {
while (count--) {
memcpy(dst, src, dst_stride);
src += src_stride;
dst += dst_stride;
/* The GL 4.5 spec says:
* "If any enabled array’s buffer binding is zero when DrawArrays or
* one of the other drawing commands defined in section 10.4 is called,
* the result is undefined."
*
* In this case, let's the dst with undefined values
*/
if (src != NULL) {
if (dst_stride == src_stride) {
memcpy(dst, src, size);
} else {
while (count--) {
memcpy(dst, src, dst_stride);
src += src_stride;
dst += dst_stride;
}
}
}
buffer->stride = dst_stride;