mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-30 13:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

i965: Combine src/dest tex vs. rb checks in intel_copy_image_sub_data.

Browse Source 
This simplifies things a little - now we only have one (tex or rb?)
if-ladder for src, and a second for dst, rather than four.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
This commit is contained in:
Kenneth Graunke 2016-05-19 20:29:04 -07:00
parent 1b39c5efca
commit 2dc98d9a15
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mesa/drivers/dri/i965/intel_copy_image.c
View File

@ -225,26 +225,6 @@ intel_copy_image_sub_data(struct gl_context *ctx,
if (src_image) {
src_mt = intel_texture_image(src_image)->mt;
} else {
assert(src_renderbuffer);
src_mt = intel_renderbuffer(src_renderbuffer)->mt;
src_image = src_renderbuffer->TexImage;
}
if (dst_image) {
dst_mt = intel_texture_image(dst_image)->mt;
} else {
assert(dst_renderbuffer);
dst_mt = intel_renderbuffer(dst_renderbuffer)->mt;
dst_image = dst_renderbuffer->TexImage;
}
if (src_mt->num_samples > 0 || dst_mt->num_samples > 0) {
_mesa_problem(ctx, "Failed to copy multisampled texture with meta path\n");
return;
}
if (src_image) {
src_level = src_image->Level + src_image->TexObject->MinLevel;
/* Cube maps actually have different images per face */
@ -253,10 +233,15 @@ intel_copy_image_sub_data(struct gl_context *ctx,
src_z += src_image->TexObject->MinLayer;
} else {
assert(src_renderbuffer);
src_mt = intel_renderbuffer(src_renderbuffer)->mt;
src_image = src_renderbuffer->TexImage;
src_level = 0;
}
if (dst_image) {
dst_mt = intel_texture_image(dst_image)->mt;
dst_level = dst_image->Level + dst_image->TexObject->MinLevel;
/* Cube maps actually have different images per face */
@ -265,9 +250,17 @@ intel_copy_image_sub_data(struct gl_context *ctx,
dst_z += dst_image->TexObject->MinLayer;
} else {
assert(dst_renderbuffer);
dst_mt = intel_renderbuffer(dst_renderbuffer)->mt;
dst_image = dst_renderbuffer->TexImage;
dst_level = 0;
}
if (src_mt->num_samples > 0 || dst_mt->num_samples > 0) {
_mesa_problem(ctx, "Failed to copy multisampled texture with BLORP\n");
return;
}
/* We are now going to try and copy the texture using the blitter. If
* that fails, we will fall back mapping the texture and using memcpy.
* In either case, we need to do a full resolve.