X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fetnaviv%2Fetnaviv_uniforms.c;h=a8d970d185a52e7c2d07a0187f0223dd4939f37a;hb=ec43605189907fa327a4a7f457aa3c822cfdea5d;hp=70e5d58ecb3b2885cc35d9323c6b9fd0b15aae67;hpb=c9e8b49b885242d84ba031dacef5aa4a5ac1e5b6;p=mesa.git

diff --git a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c
index 70e5d58ecb3..a8d970d185a 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c
@@ -59,7 +59,7 @@ get_texrect_scale(const struct etna_context *ctx, bool frag,
 
 void
 etna_uniforms_write(const struct etna_context *ctx,
-                    const struct etna_shader *sobj,
+                    const struct etna_shader_variant *sobj,
                     struct pipe_constant_buffer *cb, uint32_t *uniforms,
                     unsigned *size)
 {
@@ -72,7 +72,7 @@ etna_uniforms_write(const struct etna_context *ctx,
       memcpy(uniforms, cb->user_buffer, size);
    }
 
-   if (sobj == ctx->fs)
+   if (sobj == ctx->shader.fs)
       frag = true;
 
    for (uint32_t i = 0; i < uinfo->imm_count; i++) {
@@ -97,7 +97,7 @@ etna_uniforms_write(const struct etna_context *ctx,
 }
 
 void
-etna_set_shader_uniforms_dirty_flags(struct etna_shader *sobj)
+etna_set_shader_uniforms_dirty_flags(struct etna_shader_variant *sobj)
 {
    uint32_t dirty = 0;