From 1e77c9334047d1f084714c64f6996d010833f73f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Sep 2014 15:59:54 -0700 Subject: [PATCH] vc4: Move the texture format into a struct. I'm going to be putting some bitfields into the struct as well. --- src/gallium/drivers/vc4/vc4_program.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index ba6ed3c243e..0252b995d74 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -40,7 +40,9 @@ struct vc4_key { struct pipe_shader_state *shader_state; - enum pipe_format tex_format[VC4_MAX_TEXTURE_SAMPLERS]; + struct { + enum pipe_format format; + } tex[VC4_MAX_TEXTURE_SAMPLERS]; }; struct vc4_fs_key { @@ -499,7 +501,7 @@ tgsi_to_qir_tex(struct vc4_compile *c, c->num_texture_samples++; struct qreg r4 = qir_TEX_RESULT(c); - enum pipe_format format = c->key->tex_format[unit]; + enum pipe_format format = c->key->tex[unit].format; struct qreg unpacked[4]; if (util_format_is_depth_or_stencil(format)) { @@ -1431,7 +1433,7 @@ vc4_setup_shared_key(struct vc4_key *key, struct vc4_texture_stateobj *texstate) struct pipe_sampler_view *sampler = texstate->textures[i]; if (sampler) { struct pipe_resource *prsc = sampler->texture; - key->tex_format[i] = prsc->format; + key->tex[i].format = prsc->format; } } } -- 2.30.2