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

vrend: copy_fallback: limit per slice transfer to slice size (v2)

Browse Source 
When calling glGetnTexImage, glGetnCompressedTexImage, or
glCompressedTexSubImage*D and the data pointer is updated with the
per-slice offset but as bufSize value the full length of the
buffer was given, which can result in a crash of qemu when the buffer
size was not evaluated correctly.
Vor cubemaps instead of passing the size of the whole buffer pass the
size of the slice to make sure that glGetnTexImage doesn't write to
unallocated memory.

v2: Correct handling for 3D textures that are read as one big chunk
    vs. cubemaps that are read slice-by-slice (Gurchetan Singh)

Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>
macos/master
Gert Wollny 7 years ago committed by Jakob Bornecrantz
parent 75a0b464b6
commit 8d210b8b6a
1 changed files with 10 additions and 8 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. 18
      src/vrend_renderer.c

18
src/vrend_renderer.c
Unescape View File

@ -6091,7 +6091,7 @@ static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
const struct pipe_box *src_box) const struct pipe_box *src_box)
{ {
char *tptr; char *tptr;
uint32_t transfer_size, src_stride, dst_stride; uint32_t total_size, src_stride, dst_stride;
GLenum glformat, gltype; GLenum glformat, gltype;
int elsize = util_format_get_blocksize(dst_res->base.format); int elsize = util_format_get_blocksize(dst_res->base.format);
int compressed = util_format_is_compressed(dst_res->base.format); int compressed = util_format_is_compressed(dst_res->base.format);
@ -6115,9 +6115,9 @@ static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
/* this is ugly need to do a full GetTexImage */ /* this is ugly need to do a full GetTexImage */
slice_size = util_format_get_nblocks(src_res->base.format, u_minify(src_res->base.width0, src_level), u_minify(src_res->base.height0, src_level)) * slice_size = util_format_get_nblocks(src_res->base.format, u_minify(src_res->base.width0, src_level), u_minify(src_res->base.height0, src_level)) *
util_format_get_blocksize(src_res->base.format); util_format_get_blocksize(src_res->base.format);
transfer_size = slice_size * vrend_get_texture_depth(src_res, src_level); total_size = slice_size * vrend_get_texture_depth(src_res, src_level);
tptr = malloc(transfer_size); tptr = malloc(total_size);
if (!tptr) if (!tptr)
return; return;
@ -6151,9 +6151,10 @@ static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
as 32-bit scaled integers, so we need to scale them here */ as 32-bit scaled integers, so we need to scale them here */
if (dst_res->base.format == (enum pipe_format)VIRGL_FORMAT_Z24X8_UNORM) { if (dst_res->base.format == (enum pipe_format)VIRGL_FORMAT_Z24X8_UNORM) {
float depth_scale = 256.0; float depth_scale = 256.0;
vrend_scale_depth(tptr, transfer_size, depth_scale); vrend_scale_depth(tptr, total_size, depth_scale);
} }
} else { } else {
uint32_t read_chunk_size;
switch (elsize) { switch (elsize) {
case 1: case 1:
case 3: case 3:
@ -6173,17 +6174,18 @@ static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
} }
glBindTexture(src_res->target, src_res->id); glBindTexture(src_res->target, src_res->id);
slice_offset = 0; slice_offset = 0;
read_chunk_size = (src_res->target == GL_TEXTURE_CUBE_MAP) ? slice_size : total_size;
for (i = 0; i < cube_slice; i++) { for (i = 0; i < cube_slice; i++) {
GLenum ctarget = src_res->target == GL_TEXTURE_CUBE_MAP ? GLenum ctarget = src_res->target == GL_TEXTURE_CUBE_MAP ?
(GLenum)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i) : src_res->target; (GLenum)(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i) : src_res->target;
if (compressed) { if (compressed) {
if (vrend_state.have_arb_robustness) if (vrend_state.have_arb_robustness)
glGetnCompressedTexImageARB(ctarget, src_level, transfer_size, tptr + slice_offset); glGetnCompressedTexImageARB(ctarget, src_level, read_chunk_size, tptr + slice_offset);
else else
glGetCompressedTexImage(ctarget, src_level, tptr + slice_offset); glGetCompressedTexImage(ctarget, src_level, tptr + slice_offset);
} else { } else {
if (vrend_state.have_arb_robustness) if (vrend_state.have_arb_robustness)
glGetnTexImageARB(ctarget, src_level, glformat, gltype, transfer_size, tptr + slice_offset); glGetnTexImageARB(ctarget, src_level, glformat, gltype, read_chunk_size, tptr + slice_offset);
else else
glGetTexImage(ctarget, src_level, glformat, gltype, tptr + slice_offset); glGetTexImage(ctarget, src_level, glformat, gltype, tptr + slice_offset);
} }
@ -6221,11 +6223,11 @@ static void vrend_resource_copy_fallback(struct vrend_resource *src_res,
if (ctarget == GL_TEXTURE_1D) { if (ctarget == GL_TEXTURE_1D) {
glCompressedTexSubImage1D(ctarget, dst_level, dstx, glCompressedTexSubImage1D(ctarget, dst_level, dstx,
src_box->width, src_box->width,
glformat, transfer_size, tptr + slice_offset); glformat, slice_size, tptr + slice_offset);
} else { } else {
glCompressedTexSubImage2D(ctarget, dst_level, dstx, dsty, glCompressedTexSubImage2D(ctarget, dst_level, dstx, dsty,
src_box->width, src_box->height, src_box->width, src_box->height,
glformat, transfer_size, tptr + slice_offset); glformat, slice_size, tptr + slice_offset);
} }
} else { } else {
if (ctarget == GL_TEXTURE_1D) { if (ctarget == GL_TEXTURE_1D) {

Write Preview
Loading…
Cancel
Save