diff options
| author | Marek Olšák <[email protected]> | 2017-01-31 00:56:34 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-30 14:44:33 +0200 |
| commit | 405bacd820027a239caca203cf6602da70dc5bbc (patch) | |
| tree | 2ff7fb3815d5815e7870dcbb4bfb98455fd82742 /src/gallium/drivers/r600 | |
| parent | 354285afa08f48d0aab232820698aacc54e347f7 (diff) | |
radeonsi/gfx9: fix MIP0_WIDTH & MIP0_HEIGHT for compressed texture blits
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 650d1a45de8..c52492e8c2d 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -726,7 +726,10 @@ void r600_resource_copy_region(struct pipe_context *ctx, } } - dst_view = r600_create_surface_custom(ctx, dst, &dst_templ, dst_width, dst_height); + dst_view = r600_create_surface_custom(ctx, dst, &dst_templ, + /* we don't care about these two for r600g */ + dst->width0, dst->height0, + dst_width, dst_height); if (rctx->b.chip_class >= EVERGREEN) { src_view = evergreen_create_sampler_view_custom(ctx, src, &src_templ, diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 1d65cb317d8..a7b7276732c 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -737,10 +737,6 @@ unsigned r600_tex_wrap(unsigned wrap); unsigned r600_tex_mipfilter(unsigned filter); unsigned r600_tex_compare(unsigned compare); bool sampler_state_needs_border_color(const struct pipe_sampler_state *state); -struct pipe_surface *r600_create_surface_custom(struct pipe_context *pipe, - struct pipe_resource *texture, - const struct pipe_surface *templ, - unsigned width, unsigned height); unsigned r600_get_swizzle_combined(const unsigned char *swizzle_format, const unsigned char *swizzle_view, boolean vtx); |