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

freedreno: stop frob'ing pipe_resource::nr_samples

Browse source 
Previously we tried to normalize nr_samples to MAX2(1, nr_samples) to
avoid having to deal with 0 vs 1 everywhere.  But this causes problems
in mesa/st, for example st_finalize_texture() will think there is a
nr_samples mismatch and recreate the texture.  Somehow this manifests
as corrupt x11 font rendering on generations that do not support MSAA
(but apparently works fine on a5xx and a6xx which do support MSAA.)

Fixes: cf0c7258ee freedreno/a5xx: MSAA
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2019-01-29 12:23:28 -05:00
parent 1a6ddfe5ee
commit c3baa077bf
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/freedreno/freedreno_batch_cache.c
View file

@ -402,7 +402,7 @@ key_surf(struct key *key, unsigned idx, unsigned pos, struct pipe_surface *psurf
key->surf[idx].texture = psurf->texture;
key->surf[idx].u = psurf->u;
key->surf[idx].pos = pos;
key->surf[idx].samples = psurf->nr_samples;
key->surf[idx].samples = MAX2(1, psurf->nr_samples);
key->surf[idx].format = psurf->format;
}

7
src/gallium/drivers/freedreno/freedreno_resource.c
View file

@ -927,8 +927,7 @@ fd_resource_create_with_modifiers(struct pipe_screen *pscreen,
rsc->internal_format = format;
rsc->cpp = util_format_get_blocksize(format);
prsc->nr_samples = MAX2(1, prsc->nr_samples);
rsc->cpp *= prsc->nr_samples;
rsc->cpp *= fd_resource_nr_samples(prsc);
assert(rsc->cpp);
@ -1053,9 +1052,9 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
if (!rsc->bo)
goto fail;
prsc->nr_samples = MAX2(1, prsc->nr_samples);
rsc->internal_format = tmpl->format;
rsc->cpp = prsc->nr_samples * util_format_get_blocksize(tmpl->format);
rsc->cpp = util_format_get_blocksize(tmpl->format);
rsc->cpp *= fd_resource_nr_samples(prsc);
slice->pitch = handle->stride / rsc->cpp;
slice->offset = handle->offset;
slice->size0 = handle->stride * prsc->height0;

9
src/gallium/drivers/freedreno/freedreno_resource.h
View file

@ -179,6 +179,15 @@ fd_resource_level_linear(struct pipe_resource *prsc, int level)
return false;
}
/* access # of samples, with 0 normalized to 1 (which is what we care about
* most of the time)
*/
static inline unsigned
fd_resource_nr_samples(struct pipe_resource *prsc)
{
return MAX2(1, prsc->nr_samples);
}
void fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard,
enum fd_render_stage stage);
void fd_blitter_pipe_end(struct fd_context *ctx);

3
src/gallium/drivers/freedreno/freedreno_texture.c
View file

@ -31,6 +31,7 @@
#include "freedreno_texture.h"
#include "freedreno_context.h"
#include "freedreno_resource.h"
#include "freedreno_util.h"
static void
@ -83,7 +84,7 @@ static void set_sampler_views(struct fd_texture_stateobj *tex,
tex->num_textures = util_last_bit(tex->valid_textures);
for (i = 0; i < tex->num_textures; i++) {
uint nr_samples = tex->textures[i]->texture->nr_samples;
uint nr_samples = fd_resource_nr_samples(tex->textures[i]->texture);
samplers |= (nr_samples >> 1) << (i * 2);
}