third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vrend: accept empty vertex elements

Browse Source 
Vertex elements may have a count of 0, this is an acceptable value.

Fix piglit spec/glsl-1.50/execution/geometry/primitive-types
gl_triangle_fan test.
macos/master
Marc-André Lureau 10 years ago
parent e094ca79f9
commit 58ef21b0b8
1 changed files with 18 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      src/vrend_decode.c

33
src/vrend_decode.c
Unescape View File

@ -551,7 +551,7 @@ static int vrend_decode_create_sampler_state(struct vrend_decode_ctx *ctx, uint3
static int vrend_decode_create_ve(struct vrend_decode_ctx *ctx, uint32_t handle, uint16_t length) static int vrend_decode_create_ve(struct vrend_decode_ctx *ctx, uint32_t handle, uint16_t length)
{ {
struct pipe_vertex_element *ve; struct pipe_vertex_element *ve = NULL;
int num_elements; int num_elements;
int i; int i;
int ret; int ret;
@ -563,19 +563,23 @@ static int vrend_decode_create_ve(struct vrend_decode_ctx *ctx, uint32_t handle,
return EINVAL; return EINVAL;
num_elements = (length - 1) / 4; num_elements = (length - 1) / 4;
ve = calloc(num_elements, sizeof(struct pipe_vertex_element));
if (!ve) if (num_elements) {
return ENOMEM; ve = calloc(num_elements, sizeof(struct pipe_vertex_element));
for (i = 0; i < num_elements; i++) { if (!ve)
ve[i].src_offset = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_OFFSET(i)); return ENOMEM;
ve[i].instance_divisor = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_INSTANCE_DIVISOR(i));
ve[i].vertex_buffer_index = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_VERTEX_BUFFER_INDEX(i)); for (i = 0; i < num_elements; i++) {
ve[i].src_format = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_FORMAT(i)); ve[i].src_offset = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_OFFSET(i));
ve[i].instance_divisor = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_INSTANCE_DIVISOR(i));
ve[i].vertex_buffer_index = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_VERTEX_BUFFER_INDEX(i));
ve[i].src_format = get_buf_entry(ctx, VIRGL_OBJ_VERTEX_ELEMENTS_V0_SRC_FORMAT(i));
}
} }
ret = vrend_create_vertex_elements_state(ctx->grctx, handle, num_elements, ret = vrend_create_vertex_elements_state(ctx->grctx, handle, num_elements, ve);
ve);
FREE(ve); FREE(ve);
return ret; return ret;
} }
@ -603,9 +607,8 @@ static int vrend_decode_create_object(struct vrend_decode_ctx *ctx, int length)
uint8_t obj_type = (header >> 8) & 0xff; uint8_t obj_type = (header >> 8) & 0xff;
int ret = 0; int ret = 0;
/* has to be at least 3 length */ if (length < 1)
if (length < 3) return EINVAL;
return EINVAL;
switch (obj_type){ switch (obj_type){
case VIRGL_OBJECT_BLEND: case VIRGL_OBJECT_BLEND:

Write Preview
Loading…
Cancel
Save