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

panfrost: Implement command stream for linear cubemaps

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig
2019-03-28 04:33:28 +00:00
parent 70b3e5db7d
commit c87f3ce97f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/panfrost/pan_context.c
View File

@@ -1020,10 +1020,12 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data)
struct pipe_resource *tex_rsrc = ctx->sampler_views[t][i]->base.texture; struct pipe_resource *tex_rsrc = ctx->sampler_views[t][i]->base.texture;
struct panfrost_resource *rsrc = (struct panfrost_resource *) tex_rsrc; struct panfrost_resource *rsrc = (struct panfrost_resource *) tex_rsrc;
/* Inject the address in. */ /* Inject the addresses in, interleaving cube
for (int f = 0; f < tex_rsrc->array_size; ++f) { * faces and mip levels appropriately. */
for (int l = 0; l <= tex_rsrc->last_level; ++l) {
unsigned idx = f * (tex_rsrc->last_level + 1) + l; for (int l = 0; l <= tex_rsrc->last_level; ++l) {
for (int f = 0; f < tex_rsrc->array_size; ++f) {
unsigned idx = (l * tex_rsrc->array_size) + f;
ctx->sampler_views[t][i]->hw.swizzled_bitmaps[idx] = ctx->sampler_views[t][i]->hw.swizzled_bitmaps[idx] =
rsrc->bo->gpu + rsrc->bo->gpu +
@@ -1958,7 +1960,7 @@ panfrost_create_sampler_view(
.format = format, .format = format,
.usage1 = 0x0, .usage1 = 0x0,
.is_not_cubemap = 1, .is_not_cubemap = texture->target != PIPE_TEXTURE_CUBE,
.usage2 = usage2_layout .usage2 = usage2_layout
}, },

2
src/gallium/drivers/panfrost/pan_resource.c
View File

@@ -391,7 +391,7 @@ panfrost_transfer_map(struct pipe_context *pctx,
transfer->base.usage = usage; transfer->base.usage = usage;
transfer->base.box = *box; transfer->base.box = *box;
transfer->base.stride = bo->slices[level].stride; transfer->base.stride = bo->slices[level].stride;
transfer->base.layer_stride = bytes_per_pixel * resource->width0; /* TODO: Cubemaps */ transfer->base.layer_stride = bo->cubemap_stride;
pipe_resource_reference(&transfer->base.resource, resource); pipe_resource_reference(&transfer->base.resource, resource);