fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 12:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3d: Use the TLB R/B swapping instead of recompiles when available.

Browse source 
The recompile reduction is nice, but this also makes it so that a straight
texture copy could get optimized some day to not unpack/repack the f16
values.
This commit is contained in:
Eric Anholt 2018-09-10 08:19:48 -07:00
parent 3923cf626d
commit 4018eb04e8
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/v3d/v3d_resource.c
View file

@ -811,6 +811,12 @@ v3d_create_surface(struct pipe_context *pctx,
surface->format = v3d_get_rt_format(&screen->devinfo, psurf->format); surface->format = v3d_get_rt_format(&screen->devinfo, psurf->format);
const struct util_format_description *desc =
util_format_description(psurf->format);
surface->swap_rb = (desc->swizzle[0] == PIPE_SWIZZLE_Z &&
psurf->format != PIPE_FORMAT_B5G6R5_UNORM);
if (util_format_is_depth_or_stencil(psurf->format)) { if (util_format_is_depth_or_stencil(psurf->format)) {
switch (psurf->format) { switch (psurf->format) {
case PIPE_FORMAT_Z16_UNORM: case PIPE_FORMAT_Z16_UNORM:

7
src/gallium/drivers/v3d/v3d_resource.h
View file

@ -104,6 +104,13 @@ struct v3d_surface {
*/ */
uint8_t internal_bpp; uint8_t internal_bpp;
/**
* If the R and B channels should be swapped. On V3D 3.x, we do it in
* the shader and the blend equation. On V3D 4.1+, we can use the new
* TLB load/store flags instead of recompiling.
*/
bool swap_rb;
uint32_t padded_height_of_output_image_in_uif_blocks; uint32_t padded_height_of_output_image_in_uif_blocks;
/* If the resource being referenced is separate stencil, then this is /* If the resource being referenced is separate stencil, then this is

2
src/gallium/drivers/v3d/v3dx_rcl.c
View file

@ -74,6 +74,7 @@ load_general(struct v3d_cl *cl, struct pipe_surface *psurf, int buffer,
load.input_image_format = V3D_OUTPUT_IMAGE_FORMAT_S8; load.input_image_format = V3D_OUTPUT_IMAGE_FORMAT_S8;
else else
load.input_image_format = surf->format; load.input_image_format = surf->format;
load.r_b_swap = surf->swap_rb;
if (surf->tiling == VC5_TILING_UIF_NO_XOR || if (surf->tiling == VC5_TILING_UIF_NO_XOR ||
surf->tiling == VC5_TILING_UIF_XOR) { surf->tiling == VC5_TILING_UIF_XOR) {
@ -137,6 +138,7 @@ store_general(struct v3d_job *job,
else else
store.output_image_format = surf->format; store.output_image_format = surf->format;
store.r_b_swap = surf->swap_rb;
store.memory_format = surf->tiling; store.memory_format = surf->tiling;
if (surf->tiling == VC5_TILING_UIF_NO_XOR || if (surf->tiling == VC5_TILING_UIF_NO_XOR ||

5
src/gallium/drivers/v3d/v3dx_state.c
View file

@ -481,6 +481,7 @@ v3d_set_framebuffer_state(struct pipe_context *pctx,
struct pipe_surface *cbuf = v3d->framebuffer.cbufs[i]; struct pipe_surface *cbuf = v3d->framebuffer.cbufs[i];
if (!cbuf) if (!cbuf)
continue; continue;
struct v3d_surface *v3d_cbuf = v3d_surface(cbuf);
const struct util_format_description *desc = const struct util_format_description *desc =
util_format_description(cbuf->format); util_format_description(cbuf->format);
@ -488,10 +489,8 @@ v3d_set_framebuffer_state(struct pipe_context *pctx,
/* For BGRA8 formats (DRI window system default format), we /* For BGRA8 formats (DRI window system default format), we
* need to swap R and B, since the HW's format is RGBA8. * need to swap R and B, since the HW's format is RGBA8.
*/ */
if (desc->swizzle[0] == PIPE_SWIZZLE_Z && if (v3d->screen->devinfo.ver < 42 && v3d_cbuf->swap_rb)
cbuf->format != PIPE_FORMAT_B5G6R5_UNORM) {
v3d->swap_color_rb |= 1 << i; v3d->swap_color_rb |= 1 << i;
}
if (desc->swizzle[3] == PIPE_SWIZZLE_1) if (desc->swizzle[3] == PIPE_SWIZZLE_1)
v3d->blend_dst_alpha_one |= 1 << i; v3d->blend_dst_alpha_one |= 1 << i;