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

vrend: Ensure that buffer creation doesn't bleed into the texture allocation

Browse Source 
If the bind flags are not correct then the default code path would try to
create a texture with PIPE_BUFFER as target. Reorder the checks to bail out
in this case after freeing the memory.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
macos/master
Gert Wollny 5 years ago
parent 24f67de7a9
commit a156652047
1 changed files with 44 additions and 39 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. 83
      src/vrend_renderer.c

83
src/vrend_renderer.c
Unescape View File

@ -6536,41 +6536,41 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a
pipe_reference_init(&gr->base.reference, 1); pipe_reference_init(&gr->base.reference, 1);
if (args->bind == VIRGL_BIND_CUSTOM) { if (args->target == PIPE_BUFFER) {
assert(args->target == PIPE_BUFFER); if (args->bind == VIRGL_BIND_CUSTOM) {
/* use iovec directly when attached */ /* use iovec directly when attached */
gr->storage = VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM; gr->storage = VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM;
gr->ptr = malloc(args->width); gr->ptr = malloc(args->width);
if (!gr->ptr) { if (!gr->ptr) {
FREE(gr); FREE(gr);
return ENOMEM; return ENOMEM;
} }
} else if (args->bind == VIRGL_BIND_STAGING) { } else if (args->bind == VIRGL_BIND_STAGING) {
/* Staging buffers use only guest memory. */ /* Staging buffers use only guest memory. */
gr->storage = VREND_RESOURCE_STORAGE_GUEST; gr->storage = VREND_RESOURCE_STORAGE_GUEST;
} else if (args->bind == VIRGL_BIND_INDEX_BUFFER) { } else if (args->bind == VIRGL_BIND_INDEX_BUFFER) {
gr->target = GL_ELEMENT_ARRAY_BUFFER_ARB; gr->target = GL_ELEMENT_ARRAY_BUFFER_ARB;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->bind == VIRGL_BIND_STREAM_OUTPUT) { } else if (args->bind == VIRGL_BIND_STREAM_OUTPUT) {
gr->target = GL_TRANSFORM_FEEDBACK_BUFFER; gr->target = GL_TRANSFORM_FEEDBACK_BUFFER;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->bind == VIRGL_BIND_VERTEX_BUFFER) { } else if (args->bind == VIRGL_BIND_VERTEX_BUFFER) {
gr->target = GL_ARRAY_BUFFER_ARB; gr->target = GL_ARRAY_BUFFER_ARB;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->bind == VIRGL_BIND_CONSTANT_BUFFER) { } else if (args->bind == VIRGL_BIND_CONSTANT_BUFFER) {
gr->target = GL_UNIFORM_BUFFER; gr->target = GL_UNIFORM_BUFFER;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->bind == VIRGL_BIND_QUERY_BUFFER) { } else if (args->bind == VIRGL_BIND_QUERY_BUFFER) {
gr->target = GL_QUERY_BUFFER; gr->target = GL_QUERY_BUFFER;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->bind == VIRGL_BIND_COMMAND_ARGS) { } else if (args->bind == VIRGL_BIND_COMMAND_ARGS) {
gr->target = GL_DRAW_INDIRECT_BUFFER; gr->target = GL_DRAW_INDIRECT_BUFFER;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->target == PIPE_BUFFER && (args->bind == 0 || args->bind == VIRGL_BIND_SHADER_BUFFER)) { } else if (args->bind == 0 || args->bind == VIRGL_BIND_SHADER_BUFFER) {
gr->target = GL_ARRAY_BUFFER_ARB; gr->target = GL_ARRAY_BUFFER_ARB;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
} else if (args->target == PIPE_BUFFER && (args->bind & VIRGL_BIND_SAMPLER_VIEW)) { } else if (args->bind & VIRGL_BIND_SAMPLER_VIEW) {
/* /*
* On Desktop we use GL_ARB_texture_buffer_object on GLES we use * On Desktop we use GL_ARB_texture_buffer_object on GLES we use
* GL_EXT_texture_buffer (it is in the ANDRIOD extension pack). * GL_EXT_texture_buffer (it is in the ANDRIOD extension pack).
*/ */
@ -6579,12 +6579,17 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a
#endif #endif
/* need to check GL version here */ /* need to check GL version here */
if (has_feature(feat_arb_or_gles_ext_texture_buffer)) { if (has_feature(feat_arb_or_gles_ext_texture_buffer)) {
gr->target = GL_TEXTURE_BUFFER; gr->target = GL_TEXTURE_BUFFER;
} else {
gr->target = GL_PIXEL_PACK_BUFFER_ARB;
}
vrend_create_buffer(gr, args->width);
} else { } else {
gr->target = GL_PIXEL_PACK_BUFFER_ARB; vrend_printf("%s: Illegal buffer binding flags 0x%x\n", __func__, args->bind);
FREE(gr);
return EINVAL;
} }
vrend_create_buffer(gr, args->width);
} else { } else {
int r = vrend_renderer_resource_allocate_texture(gr, image_oes); int r = vrend_renderer_resource_allocate_texture(gr, image_oes);
if (r) { if (r) {

Write Preview
Loading…
Cancel
Save