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

st/mesa: create temporary textures with the same nr_samples as source

Browse source 
Not sure if this is actually reachable in practice (to have a complex
copy with MS textures).

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Ilia Mirkin 2015-10-28 15:38:53 -04:00
parent afbe8b6085
commit 6166a8e369
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/state_tracker/st_cb_copyimage.c
View file

@ -359,6 +359,7 @@ same_size_and_swizzle(const struct util_format_description *d1,
static struct pipe_resource *
create_texture(struct pipe_screen *screen, enum pipe_format format,
unsigned nr_samples,
unsigned width, unsigned height, unsigned depth)
{
struct pipe_resource templ;
@ -369,6 +370,7 @@ create_texture(struct pipe_screen *screen, enum pipe_format format,
templ.height0 = height;
templ.depth0 = 1;
templ.array_size = depth;
templ.nr_samples = nr_samples;
templ.usage = PIPE_USAGE_DEFAULT;
templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
@ -439,7 +441,8 @@ handle_complex_copy(struct pipe_context *pipe,
/* Use the temporary texture. Src is converted to a canonical format,
* then proceed the generic swizzled_copy.
*/
temp = create_texture(pipe->screen, canon_format, src_box->width,
temp = create_texture(pipe->screen, canon_format, src->nr_samples,
src_box->width,
src_box->height, src_box->depth);
u_box_3d(0, 0, 0, src_box->width, src_box->height, src_box->depth,
@ -463,7 +466,8 @@ handle_complex_copy(struct pipe_context *pipe,
/* Use the temporary texture. First, use the generic copy, but use
* a canonical format in the destination. Then convert */
temp = create_texture(pipe->screen, canon_format, src_box->width,
temp = create_texture(pipe->screen, canon_format, dst->nr_samples,
src_box->width,
src_box->height, src_box->depth);
u_box_3d(0, 0, 0, src_box->width, src_box->height, src_box->depth,