diff options
| author | Marek Olšák <[email protected]> | 2017-09-13 02:26:26 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-09-26 04:21:14 +0200 |
| commit | 06bfb2d28f7adca7edc6be9c210a7a3583023652 (patch) | |
| tree | a969d20fe1d2a75eb03facabe4c5fb83948178f0 /src/gallium/drivers/radeonsi/si_blit.c | |
| parent | e1623da8185ee5d167cd331fb645e6a83961285a (diff) | |
r600: fork and import gallium/radeon
This marks the end of code sharing between r600 and radeonsi.
It's getting difficult to work on radeonsi without breaking r600.
A lot of functions had to be renamed to prevent linker conflicts.
There are also minor cleanups.
Acked-by: Dave Airlie <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_blit.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_blit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 0ecfc83fe24..159893dfa11 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -350,7 +350,7 @@ si_decompress_depth(struct si_context *sctx, */ if (copy_planes && (tex->flushed_depth_texture || - r600_init_flushed_depth_texture(&sctx->b.b, &tex->resource.b.b, NULL))) { + si_init_flushed_depth_texture(&sctx->b.b, &tex->resource.b.b, NULL))) { struct r600_texture *dst = tex->flushed_depth_texture; unsigned fully_copied_levels; unsigned levels = 0; @@ -621,7 +621,7 @@ static void si_check_render_feedback_texture(struct si_context *sctx, } if (render_feedback) - r600_texture_disable_dcc(&sctx->b, tex); + si_texture_disable_dcc(&sctx->b, tex); } static void si_check_render_feedback_textures(struct si_context *sctx, @@ -835,7 +835,7 @@ static void si_clear(struct pipe_context *ctx, unsigned buffers, zsbuf ? (struct r600_texture*)zsbuf->texture : NULL; if (buffers & PIPE_CLEAR_COLOR) { - evergreen_do_fast_color_clear(&sctx->b, fb, + si_do_fast_color_clear(&sctx->b, fb, &sctx->framebuffer.atom, &buffers, &sctx->framebuffer.dirty_cbufs, color); @@ -1175,7 +1175,7 @@ void si_resource_copy_region(struct pipe_context *ctx, src_templ.format); /* Initialize the surface. */ - dst_view = r600_create_surface_custom(ctx, dst, &dst_templ, + dst_view = si_create_surface_custom(ctx, dst, &dst_templ, dst_width0, dst_height0, dst_width, dst_height); |