struct pipe_resource *tex_rsrc = ctx->sampler_views[t][i]->base.texture;
struct panfrost_resource *rsrc = (struct panfrost_resource *) tex_rsrc;
- /* Inject the address in. */
- for (int f = 0; f < tex_rsrc->array_size; ++f) {
- for (int l = 0; l <= tex_rsrc->last_level; ++l) {
- unsigned idx = f * (tex_rsrc->last_level + 1) + l;
+ /* Inject the addresses in, interleaving cube
+ * faces and mip levels appropriately. */
+
+ 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] =
rsrc->bo->gpu +
.format = format,
.usage1 = 0x0,
- .is_not_cubemap = 1,
+ .is_not_cubemap = texture->target != PIPE_TEXTURE_CUBE,
.usage2 = usage2_layout
},
transfer->base.usage = usage;
transfer->base.box = *box;
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);