On Saturday, April 16, 2016 4:42:42 PM PDT Topi Pohjolainen wrote: > In order to support cases where gen9 uses RGBA format to back client > requested RGB, one needs to have means to force alpha channel to one > when user requested RGB surface is used as blit source. > > Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com> > --- > src/mesa/drivers/dri/i965/brw_blorp.cpp | 3 ++- > src/mesa/drivers/dri/i965/brw_blorp.h | 10 +++++++++- > src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 13 +++++++++---- > src/mesa/drivers/dri/i965/gen8_blorp.cpp | 2 +- > src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 5 +++-- > 5 files changed, 24 insertions(+), 9 deletions(-)
Hmm, right - Neil's patch makes it so RGBX formats aren't renderable, so
core Mesa chooses an RGBA backing format for us. I never understood
why that was, but it would make a change along these lines necessary.
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/
i965/brw_blorp.cpp
> index 38a3236..04a019e 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
> @@ -43,7 +43,8 @@ brw_blorp_mip_info::brw_blorp_mip_info()
>
> brw_blorp_surface_info::brw_blorp_surface_info()
> : map_stencil_as_y_tiled(false),
> - num_samples(0)
> + num_samples(0),
> + swizzle(SWIZZLE_XYZW)
> {
> }
>
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/
i965/brw_blorp.h
> index 8e30770..7ebcee2 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp.h
> +++ b/src/mesa/drivers/dri/i965/brw_blorp.h
> @@ -38,7 +38,7 @@ void
> brw_blorp_blit_miptrees(struct brw_context *brw,
> struct intel_mipmap_tree *src_mt,
> unsigned src_level, unsigned src_layer,
> - mesa_format src_format,
> + mesa_format src_format, int src_swizzle,
> struct intel_mipmap_tree *dst_mt,
> unsigned dst_level, unsigned dst_layer,
> mesa_format dst_format,
> @@ -164,6 +164,14 @@ public:
> * surface state for this surface.
> */
> intel_msaa_layout msaa_layout;
> +
> + /**
> + * In order to support cases where RGBA format is backing client
requested
> + * RGB, one needs to have means to force alpha channel to one when user
> + * requested RGB surface is used as blit source. This is possible by
> + * setting source swizzle for the texture surface.
> + */
> + int swizzle;
> };
>
>
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/
drivers/dri/i965/brw_blorp_blit.cpp
> index 35ab9af..98e33bd 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
> @@ -56,7 +56,7 @@ void
> brw_blorp_blit_miptrees(struct brw_context *brw,
> struct intel_mipmap_tree *src_mt,
> unsigned src_level, unsigned src_layer,
> - mesa_format src_format,
> + mesa_format src_format, int src_swizzle,
> struct intel_mipmap_tree *dst_mt,
> unsigned dst_level, unsigned dst_layer,
> mesa_format dst_format,
> @@ -105,6 +105,8 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
> dst_x0, dst_y0,
> dst_x1, dst_y1,
> filter, mirror_x, mirror_y);
> + params.src.swizzle = src_swizzle;
> +
> brw_blorp_exec(brw, ¶ms);
>
> intel_miptree_slice_set_needs_hiz_resolve(dst_mt, dst_level, dst_layer);
> @@ -123,11 +125,14 @@ do_blorp_blit(struct brw_context *brw, GLbitfield
buffer_bit,
> struct intel_mipmap_tree *dst_mt = find_miptree(buffer_bit, dst_irb);
>
> const bool es3 = _mesa_is_gles3(&brw->ctx);
> + const int src_swizzle = src_irb->Base.Base._BaseFormat == GL_RGB ?
> + MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_ONE) :
> + SWIZZLE_XYZW;
Eventually, it would be nice to reuse part of brw_get_texture_swizzle().
Or create a helper that uses _mesa_format_has_color_component() to
override components to SWIZZLE_ZERO / SWIZZLE_ONE as necessary.
I guess this works for now. Might be nice to put it in a helper.
>
> /* Do the blit */
> brw_blorp_blit_miptrees(brw,
> src_mt, src_irb->mt_level, src_irb->mt_layer,
> - src_format,
> + src_format, src_swizzle,
> dst_mt, dst_irb->mt_level, dst_irb->mt_layer,
> dst_format,
> srcX0, srcY0, srcX1, srcY1,
> @@ -295,7 +300,7 @@ brw_blorp_copytexsubimage(struct brw_context *brw,
>
> brw_blorp_blit_miptrees(brw,
> src_mt, src_irb->mt_level, src_irb->mt_layer,
> - src_rb->Format,
> + src_rb->Format, SWIZZLE_XYZW,
Doesn't CopyTexSubImage need the same RGB -> RGBA swizzle override as
BlitFramebuffer? If so, a helper would be useful...
> dst_mt, dst_level, dst_slice,
> dst_image->TexFormat,
> srcX0, srcY0, srcX1, srcY1,
> @@ -321,7 +326,7 @@ brw_blorp_copytexsubimage(struct brw_context *brw,
> if (src_mt != dst_mt) {
> brw_blorp_blit_miptrees(brw,
> src_mt, src_irb->mt_level, src_irb-
>mt_layer,
> - src_mt->format,
> + src_mt->format, SWIZZLE_XYZW,
> dst_mt, dst_level, dst_slice,
> dst_mt->format,
> srcX0, srcY0, srcX1, srcY1,
> diff --git a/src/mesa/drivers/dri/i965/gen8_blorp.cpp b/src/mesa/drivers/
dri/i965/gen8_blorp.cpp
> index 0c15d36..81ec57a 100644
> --- a/src/mesa/drivers/dri/i965/gen8_blorp.cpp
> +++ b/src/mesa/drivers/dri/i965/gen8_blorp.cpp
> @@ -598,7 +598,7 @@ gen8_blorp_emit_surface_states(struct brw_context *brw,
> layer, layer + depth,
> surface->level, max_level,
> surface->brw_surfaceformat,
> - SWIZZLE_XYZW,
> + surface->swizzle,
> &wm_surf_offset_texture,
> -1, false, false);
> }
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/
drivers/dri/i965/intel_mipmap_tree.c
> index 9e84abb..7f8b3c1 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -2166,7 +2166,8 @@ intel_miptree_updownsample(struct brw_context *brw,
> {
> if (brw->gen < 8) {
> brw_blorp_blit_miptrees(brw,
> - src, 0 /* level */, 0 /* layer */, src-
>format,
> + src, 0 /* level */, 0 /* layer */,
> + src->format, SWIZZLE_XYZW,
> dst, 0 /* level */, 0 /* layer */, dst-
>format,
> 0, 0,
> src->logical_width0, src->logical_height0,
> @@ -2188,7 +2189,7 @@ intel_miptree_updownsample(struct brw_context *brw,
>
> brw_blorp_blit_miptrees(brw,
> src->stencil_mt, 0 /* level */, 0 /* layer
*/,
> - src->stencil_mt->format,
> + src->stencil_mt->format, SWIZZLE_XYZW,
> dst->stencil_mt, 0 /* level */, 0 /* layer
*/,
> dst->stencil_mt->format,
> 0, 0,
>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
