OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno: remove use of u_transfer

Browse Source 
Freedreno doesn't treat buffers and images differently, so it's use was
kind of pointless.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark
2017-12-04 09:02:07 -05:00
parent 7c3f958d23
commit e90f1a26c3
11 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/freedreno/a3xx/fd3_emit.c
View File

@@ -209,7 +209,7 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
fd3_pipe_sampler_view(tex->textures[i]) : fd3_pipe_sampler_view(tex->textures[i]) :
&dummy_view; &dummy_view;
struct fd_resource *rsc = fd_resource(view->base.texture); struct fd_resource *rsc = fd_resource(view->base.texture);
if (rsc && rsc->base.b.target == PIPE_BUFFER) { if (rsc && rsc->base.target == PIPE_BUFFER) {
OUT_RELOC(ring, rsc->bo, view->base.u.buf.offset, 0, 0); OUT_RELOC(ring, rsc->bo, view->base.u.buf.offset, 0, 0);
j = 1; j = 1;
} else { } else {
@@ -308,7 +308,7 @@ fd3_emit_gmem_restore_tex(struct fd_ringbuffer *ring,
*/ */
if (rsc->stencil && i == 0) { if (rsc->stencil && i == 0) {
rsc = rsc->stencil; rsc = rsc->stencil;
format = fd_gmem_restore_format(rsc->base.b.format); format = fd_gmem_restore_format(rsc->base.format);
} }
/* note: PIPE_BUFFER disallowed for surfaces */ /* note: PIPE_BUFFER disallowed for surfaces */

4
src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
View File

@@ -78,7 +78,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
*/ */
if (rsc->stencil) { if (rsc->stencil) {
rsc = rsc->stencil; rsc = rsc->stencil;
pformat = rsc->base.b.format; pformat = rsc->base.format;
if (bases) if (bases)
bases++; bases++;
} }
@@ -324,7 +324,7 @@ emit_gmem2mem_surf(struct fd_batch *batch,
enum pipe_format format = psurf->format; enum pipe_format format = psurf->format;
if (stencil) { if (stencil) {
rsc = rsc->stencil; rsc = rsc->stencil;
format = rsc->base.b.format; format = rsc->base.format;
} }
struct fd_resource_slice *slice = fd_resource_slice(rsc, psurf->u.tex.level); struct fd_resource_slice *slice = fd_resource_slice(rsc, psurf->u.tex.level);
uint32_t offset = fd_resource_offset(rsc, psurf->u.tex.level, uint32_t offset = fd_resource_offset(rsc, psurf->u.tex.level,

2
src/gallium/drivers/freedreno/a4xx/fd4_emit.c
View File

@@ -298,7 +298,7 @@ fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, unsigned nr_bufs,
*/ */
if (rsc->stencil && (i == 0)) { if (rsc->stencil && (i == 0)) {
rsc = rsc->stencil; rsc = rsc->stencil;
format = fd_gmem_restore_format(rsc->base.b.format); format = fd_gmem_restore_format(rsc->base.format);
} }
/* note: PIPE_BUFFER disallowed for surfaces */ /* note: PIPE_BUFFER disallowed for surfaces */

4
src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
View File

@@ -79,7 +79,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
*/ */
if (rsc->stencil) { if (rsc->stencil) {
rsc = rsc->stencil; rsc = rsc->stencil;
pformat = rsc->base.b.format; pformat = rsc->base.format;
if (bases) if (bases)
bases++; bases++;
} }
@@ -160,7 +160,7 @@ emit_gmem2mem_surf(struct fd_batch *batch, bool stencil,
if (stencil) { if (stencil) {
debug_assert(rsc->stencil); debug_assert(rsc->stencil);
rsc = rsc->stencil; rsc = rsc->stencil;
pformat = rsc->base.b.format; pformat = rsc->base.format;
} }
slice = &rsc->slices[psurf->u.tex.level]; slice = &rsc->slices[psurf->u.tex.level];

2
src/gallium/drivers/freedreno/a4xx/fd4_texture.c
View File

@@ -233,7 +233,7 @@ fd4_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
if (format == PIPE_FORMAT_X32_S8X24_UINT) { if (format == PIPE_FORMAT_X32_S8X24_UINT) {
rsc = rsc->stencil; rsc = rsc->stencil;
format = rsc->base.b.format; format = rsc->base.format;
} }
so->base = *cso; so->base = *cso;

2
src/gallium/drivers/freedreno/a5xx/fd5_gmem.c
View File

@@ -484,7 +484,7 @@ emit_mem2gmem_surf(struct fd_batch *batch, uint32_t base,
// might be required for doing depth/stencil in bypass mode? // might be required for doing depth/stencil in bypass mode?
struct fd_resource_slice *slice = fd_resource_slice(rsc, 0); struct fd_resource_slice *slice = fd_resource_slice(rsc, 0);
enum a5xx_color_fmt format = enum a5xx_color_fmt format =
fd5_pipe2color(fd_gmem_restore_format(rsc->base.b.format)); fd5_pipe2color(fd_gmem_restore_format(rsc->base.format));
OUT_PKT4(ring, REG_A5XX_RB_MRT_BUF_INFO(0), 5); OUT_PKT4(ring, REG_A5XX_RB_MRT_BUF_INFO(0), 5);
OUT_RING(ring, A5XX_RB_MRT_BUF_INFO_COLOR_FORMAT(format) | OUT_RING(ring, A5XX_RB_MRT_BUF_INFO_COLOR_FORMAT(format) |

2
src/gallium/drivers/freedreno/a5xx/fd5_texture.c
View File

@@ -206,7 +206,7 @@ fd5_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
if (format == PIPE_FORMAT_X32_S8X24_UINT) { if (format == PIPE_FORMAT_X32_S8X24_UINT) {
rsc = rsc->stencil; rsc = rsc->stencil;
format = rsc->base.b.format; format = rsc->base.format;
} }
so->base = *cso; so->base = *cso;

2
src/gallium/drivers/freedreno/freedreno_batch_cache.c
View File

@@ -229,7 +229,7 @@ fd_bc_invalidate_batch(struct fd_batch *batch, bool destroy)
void void
fd_bc_invalidate_resource(struct fd_resource *rsc, bool destroy) fd_bc_invalidate_resource(struct fd_resource *rsc, bool destroy)
{ {
struct fd_screen *screen = fd_screen(rsc->base.b.screen); struct fd_screen *screen = fd_screen(rsc->base.screen);
struct fd_batch *batch; struct fd_batch *batch;
mtx_lock(&screen->lock); mtx_lock(&screen->lock);

42
src/gallium/drivers/freedreno/freedreno_resource.c
View File

@@ -98,7 +98,7 @@ rebind_resource(struct fd_context *ctx, struct pipe_resource *prsc)
static void static void
realloc_bo(struct fd_resource *rsc, uint32_t size) realloc_bo(struct fd_resource *rsc, uint32_t size)
{ {
struct fd_screen *screen = fd_screen(rsc->base.b.screen); struct fd_screen *screen = fd_screen(rsc->base.screen);
uint32_t flags = DRM_FREEDRENO_GEM_CACHE_WCOMBINE | uint32_t flags = DRM_FREEDRENO_GEM_CACHE_WCOMBINE |
DRM_FREEDRENO_GEM_TYPE_KMEM; /* TODO */ DRM_FREEDRENO_GEM_TYPE_KMEM; /* TODO */
@@ -137,7 +137,7 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc,
unsigned level, const struct pipe_box *box) unsigned level, const struct pipe_box *box)
{ {
struct pipe_context *pctx = &ctx->base; struct pipe_context *pctx = &ctx->base;
struct pipe_resource *prsc = &rsc->base.b; struct pipe_resource *prsc = &rsc->base;
bool fallback = false; bool fallback = false;
if (prsc->next) if (prsc->next)
@@ -188,8 +188,8 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc,
*/ */
struct fd_resource *shadow = fd_resource(pshadow); struct fd_resource *shadow = fd_resource(pshadow);
DBG("shadow: %p (%d) -> %p (%d)\n", rsc, rsc->base.b.reference.count, DBG("shadow: %p (%d) -> %p (%d)\n", rsc, rsc->base.reference.count,
shadow, shadow->base.b.reference.count); shadow, shadow->base.reference.count);
/* TODO valid_buffer_range?? */ /* TODO valid_buffer_range?? */
swap(rsc->bo, shadow->bo); swap(rsc->bo, shadow->bo);
@@ -689,8 +689,10 @@ fd_resource_destroy(struct pipe_screen *pscreen,
static boolean static boolean
fd_resource_get_handle(struct pipe_screen *pscreen, fd_resource_get_handle(struct pipe_screen *pscreen,
struct pipe_context *pctx,
struct pipe_resource *prsc, struct pipe_resource *prsc,
struct winsys_handle *handle) struct winsys_handle *handle,
unsigned usage)
{ {
struct fd_resource *rsc = fd_resource(prsc); struct fd_resource *rsc = fd_resource(prsc);
@@ -698,19 +700,10 @@ fd_resource_get_handle(struct pipe_screen *pscreen,
rsc->slices[0].pitch * rsc->cpp, handle); rsc->slices[0].pitch * rsc->cpp, handle);
} }
static const struct u_resource_vtbl fd_resource_vtbl = {
.resource_get_handle = fd_resource_get_handle,
.resource_destroy = fd_resource_destroy,
.transfer_map = fd_resource_transfer_map,
.transfer_flush_region = fd_resource_transfer_flush_region,
.transfer_unmap = fd_resource_transfer_unmap,
};
static uint32_t static uint32_t
setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format format) setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format format)
{ {
struct pipe_resource *prsc = &rsc->base.b; struct pipe_resource *prsc = &rsc->base;
struct fd_screen *screen = fd_screen(prsc->screen); struct fd_screen *screen = fd_screen(prsc->screen);
enum util_format_layout layout = util_format_description(format)->layout; enum util_format_layout layout = util_format_description(format)->layout;
uint32_t pitchalign = screen->gmem_alignw; uint32_t pitchalign = screen->gmem_alignw;
@@ -723,7 +716,7 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
*/ */
uint32_t layers_in_level = rsc->layer_first ? 1 : prsc->array_size; uint32_t layers_in_level = rsc->layer_first ? 1 : prsc->array_size;
if (is_a5xx(screen) && (rsc->base.b.target >= PIPE_TEXTURE_2D)) if (is_a5xx(screen) && (rsc->base.target >= PIPE_TEXTURE_2D))
height = align(height, screen->gmem_alignh); height = align(height, screen->gmem_alignh);
for (level = 0; level <= prsc->last_level; level++) { for (level = 0; level <= prsc->last_level; level++) {
@@ -820,7 +813,7 @@ fd_resource_create(struct pipe_screen *pscreen,
{ {
struct fd_screen *screen = fd_screen(pscreen); struct fd_screen *screen = fd_screen(pscreen);
struct fd_resource *rsc = CALLOC_STRUCT(fd_resource); struct fd_resource *rsc = CALLOC_STRUCT(fd_resource);
struct pipe_resource *prsc = &rsc->base.b; struct pipe_resource *prsc = &rsc->base;
enum pipe_format format = tmpl->format; enum pipe_format format = tmpl->format;
uint32_t size, alignment; uint32_t size, alignment;
@@ -842,8 +835,6 @@ fd_resource_create(struct pipe_screen *pscreen,
util_range_init(&rsc->valid_buffer_range); util_range_init(&rsc->valid_buffer_range);
rsc->base.vtbl = &fd_resource_vtbl;
if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT) if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
format = PIPE_FORMAT_Z32_FLOAT; format = PIPE_FORMAT_Z32_FLOAT;
else if (screen->gpu_id < 400 && else if (screen->gpu_id < 400 &&
@@ -934,7 +925,7 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
{ {
struct fd_resource *rsc = CALLOC_STRUCT(fd_resource); struct fd_resource *rsc = CALLOC_STRUCT(fd_resource);
struct fd_resource_slice *slice = &rsc->slices[0]; struct fd_resource_slice *slice = &rsc->slices[0];
struct pipe_resource *prsc = &rsc->base.b; struct pipe_resource *prsc = &rsc->base;
uint32_t pitchalign = fd_screen(pscreen)->gmem_alignw; uint32_t pitchalign = fd_screen(pscreen)->gmem_alignw;
DBG("target=%d, format=%s, %ux%ux%u, array_size=%u, last_level=%u, " DBG("target=%d, format=%s, %ux%ux%u, array_size=%u, last_level=%u, "
@@ -959,7 +950,6 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
if (!rsc->bo) if (!rsc->bo)
goto fail; goto fail;
rsc->base.vtbl = &fd_resource_vtbl;
rsc->cpp = util_format_get_blocksize(tmpl->format); rsc->cpp = util_format_get_blocksize(tmpl->format);
slice->pitch = handle->stride / rsc->cpp; slice->pitch = handle->stride / rsc->cpp;
slice->offset = handle->offset; slice->offset = handle->offset;
@@ -1198,16 +1188,16 @@ fd_resource_screen_init(struct pipe_screen *pscreen)
{ {
pscreen->resource_create = fd_resource_create; pscreen->resource_create = fd_resource_create;
pscreen->resource_from_handle = fd_resource_from_handle; pscreen->resource_from_handle = fd_resource_from_handle;
pscreen->resource_get_handle = u_resource_get_handle_vtbl; pscreen->resource_get_handle = fd_resource_get_handle;
pscreen->resource_destroy = u_resource_destroy_vtbl; pscreen->resource_destroy = fd_resource_destroy;
} }
void void
fd_resource_context_init(struct pipe_context *pctx) fd_resource_context_init(struct pipe_context *pctx)
{ {
pctx->transfer_map = u_transfer_map_vtbl; pctx->transfer_map = fd_resource_transfer_map;
pctx->transfer_flush_region = u_transfer_flush_region_vtbl; pctx->transfer_flush_region = fd_resource_transfer_flush_region;
pctx->transfer_unmap = u_transfer_unmap_vtbl; pctx->transfer_unmap = fd_resource_transfer_unmap;
pctx->buffer_subdata = u_default_buffer_subdata; pctx->buffer_subdata = u_default_buffer_subdata;
pctx->texture_subdata = u_default_texture_subdata; pctx->texture_subdata = u_default_texture_subdata;
pctx->create_surface = fd_create_surface; pctx->create_surface = fd_create_surface;

5
src/gallium/drivers/freedreno/freedreno_resource.h
View File

@@ -31,7 +31,6 @@
#include "util/list.h" #include "util/list.h"
#include "util/u_range.h" #include "util/u_range.h"
#include "util/u_transfer.h"
#include "freedreno_batch.h" #include "freedreno_batch.h"
#include "freedreno_util.h" #include "freedreno_util.h"
@@ -64,7 +63,7 @@ struct fd_resource_slice {
struct set; struct set;
struct fd_resource { struct fd_resource {
struct u_resource base; struct pipe_resource base;
struct fd_bo *bo; struct fd_bo *bo;
uint32_t cpp; uint32_t cpp;
enum pipe_format internal_format; enum pipe_format internal_format;
@@ -144,7 +143,7 @@ fd_transfer(struct pipe_transfer *ptrans)
static inline struct fd_resource_slice * static inline struct fd_resource_slice *
fd_resource_slice(struct fd_resource *rsc, unsigned level) fd_resource_slice(struct fd_resource *rsc, unsigned level)
{ {
assert(level <= rsc->base.b.last_level); assert(level <= rsc->base.last_level);
return &rsc->slices[level]; return &rsc->slices[level];
} }

2
src/gallium/drivers/freedreno/freedreno_state.c
View File

@@ -432,7 +432,7 @@ fd_create_stream_output_target(struct pipe_context *pctx,
target->buffer_offset = buffer_offset; target->buffer_offset = buffer_offset;
target->buffer_size = buffer_size; target->buffer_size = buffer_size;
assert(rsc->base.b.target == PIPE_BUFFER); assert(rsc->base.target == PIPE_BUFFER);
util_range_add(&rsc->valid_buffer_range, util_range_add(&rsc->valid_buffer_range,
buffer_offset, buffer_offset + buffer_size); buffer_offset, buffer_offset + buffer_size);