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

freedreno/a5xx: fix txf_ms

Browse source 
Somehow this got lost from the initial MSAA patch.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2018-07-30 10:36:23 -04:00
parent f310e86a42
commit 0ea243dcd5
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/freedreno/a5xx/fd5_draw.c
View file

@ -117,6 +117,8 @@ fd5_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
.fsaturate_r = fd5_ctx->fsaturate_r,
.vastc_srgb = fd5_ctx->vastc_srgb,
.fastc_srgb = fd5_ctx->fastc_srgb,
.vsamples = ctx->tex[PIPE_SHADER_VERTEX].samples,
.fsamples = ctx->tex[PIPE_SHADER_FRAGMENT].samples,
},
.rasterflat = ctx->rasterizer->flatshade,
.sprite_coord_enable = ctx->rasterizer->sprite_coord_enable,

2
src/gallium/drivers/freedreno/freedreno_context.h
View file

@ -52,6 +52,8 @@ struct fd_texture_stateobj {
struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
unsigned num_samplers;
unsigned valid_samplers;
/* number of samples per sampler, 2 bits per sampler: */
uint32_t samples;
};
struct fd_program_stateobj {

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

@ -70,6 +70,7 @@ static void set_sampler_views(struct fd_texture_stateobj *tex,
unsigned start, unsigned nr, struct pipe_sampler_view **views)
{
unsigned i;
unsigned samplers = 0;
for (i = 0; i < nr; i++) {
struct pipe_sampler_view *view = views ? views[i] : NULL;
@ -82,6 +83,13 @@ 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;
samplers |= (nr_samples >> 1) << (i * 2);
}
tex->samples = samplers;
}
void