fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-17 19:10:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

broadcom/vc5: Fix cpp of MSAA surfaces on 4.x.

Browse source 
The internal-type-bpp path is for surfaces that get stored in the raw TLB
format.  For 4.x, we're storing MSAA as just 2x width/height at the
original format.
This commit is contained in:
Eric Anholt 2018-04-24 14:56:23 -07:00
parent ac207acb97
commit 9f3f4284c0
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/vc5/vc5_resource.c
View file

@ -566,9 +566,11 @@ vc5_resource_setup(struct pipe_screen *pscreen,
prsc->screen = pscreen;
if (prsc->nr_samples <= 1 ||
screen->devinfo.ver >= 40 ||
util_format_is_depth_or_stencil(prsc->format)) {
rsc->cpp = util_format_get_blocksize(prsc->format) *
MAX2(prsc->nr_samples, 1);
rsc->cpp = util_format_get_blocksize(prsc->format);
if (screen->devinfo.ver < 40 && prsc->nr_samples > 1)
rsc->cpp *= prsc->nr_samples;
} else {
assert(vc5_rt_format_supported(&screen->devinfo, prsc->format));
uint32_t output_image_format =

2
src/gallium/drivers/vc5/vc5_state.c
View file

@ -752,7 +752,7 @@ vc5_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *prsc,
#endif
tex.array_stride_64_byte_aligned = rsc->cube_map_stride / 64;
if (prsc->nr_samples > 1) {
if (prsc->nr_samples > 1 && V3D_VERSION < 40) {
/* Using texture views to reinterpret formats on our
* MSAA textures won't work, because we don't lay out
* the bits in memory as it's expected -- for example,