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

vc4: Add support for texture swizzles.

Browse source 
Fixes depth-tex-modes.
This commit is contained in:
Eric Anholt 2014-09-09 16:18:05 -07:00
parent 1e77c93340
commit 7d5c57f8e9
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/vc4/vc4_program.c
View file

@ -42,6 +42,7 @@ struct vc4_key {
struct pipe_shader_state *shader_state;
struct {
enum pipe_format format;
uint8_t swizzle[4];
} tex[VC4_MAX_TEXTURE_SAMPLERS];
};
@ -516,7 +517,9 @@ tgsi_to_qir_tex(struct vc4_compile *c,
unpacked[i] = qir_R4_UNPACK(c, r4, i);
}
const uint8_t *swiz = vc4_get_format_swizzle(format);
const uint8_t *format_swiz = vc4_get_format_swizzle(format);
uint8_t swiz[4];
util_format_compose_swizzles(format_swiz, c->key->tex[unit].swizzle, swiz);
for (int i = 0; i < 4; i++) {
if (!(tgsi_inst->Dst[0].Register.WriteMask & (1 << i)))
continue;
@ -1434,6 +1437,10 @@ vc4_setup_shared_key(struct vc4_key *key, struct vc4_texture_stateobj *texstate)
if (sampler) {
struct pipe_resource *prsc = sampler->texture;
key->tex[i].format = prsc->format;
key->tex[i].swizzle[0] = sampler->swizzle_r;
key->tex[i].swizzle[1] = sampler->swizzle_g;
key->tex[i].swizzle[2] = sampler->swizzle_b;
key->tex[i].swizzle[3] = sampler->swizzle_a;
}
}
}