i965/nir/vec4: Handle uniforms on vertex programs

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_state_frag.c

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c
index 61e259f388a69eaba2986403f16a10dd783825fd..248a7d2b5220bb7b3777418789d3e20382387442 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c
@@ -141,13 +141,13 @@ get_input_arg(struct combiner_state *rc, int arg, int flags)
                struct gl_texture_object *t = rc->ctx->Texture.Unit[i]._Current;
                mesa_format format = t->Image[0][t->BaseLevel]->TexFormat;
 
-               if (format == MESA_FORMAT_A8) {
+               if (format == MESA_FORMAT_A_UNORM8) {
                        /* Emulated using I8. */
                        if (is_color_operand(operand))
                                return COMBINER_SOURCE(ZERO) |
                                        get_input_mapping(rc, operand, flags);
 
-               } else if (format == MESA_FORMAT_L8) {
+               } else if (format == MESA_FORMAT_L_UNORM8) {
                        /* Emulated using I8. */
                        if (!is_color_operand(operand))
                                return COMBINER_SOURCE(ZERO) |
@@ -257,7 +257,7 @@ nv04_emit_tex_env(struct gl_context *ctx, int emit)
        struct combiner_state rc_a = {}, rc_c = {};
 
        /* Compute the new combiner state. */
-       if (ctx->Texture.Unit[i]._ReallyEnabled) {
+       if (ctx->Texture.Unit[i]._Current) {
                INIT_COMBINER(A, ctx, &rc_a, i);
                setup_combiner(&rc_a);
 
@@ -286,7 +286,7 @@ nv04_emit_tex_env(struct gl_context *ctx, int emit)
 
        /* calculate non-multitex state */
        nv04->blend &= ~NV04_TEXTURED_TRIANGLE_BLEND_TEXTURE_MAP__MASK;
-       if (ctx->Texture._EnabledUnits)
+       if (ctx->Texture._MaxEnabledTexImageUnit != -1)
                nv04->blend |= get_texenv_mode(ctx->Texture.Unit[0].EnvMode);
        else
                nv04->blend |= get_texenv_mode(GL_MODULATE);