i965/nir/vec4: Handle uniforms on vertex programs

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index 16b7acc099283826d687131d4df355681607e58e..3aad10ed62eb254ada71a482177d6e5222fd3a92 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -319,7 +319,7 @@ nouveau_polygon_mode(struct gl_context *ctx, GLenum face, GLenum mode)
 }
 
 static void
-nouveau_polygon_offset(struct gl_context *ctx, GLfloat factor, GLfloat units)
+nouveau_polygon_offset(struct gl_context *ctx, GLfloat factor, GLfloat units, GLfloat clamp)
 {
        context_dirty(ctx, POLYGON_OFFSET);
 }
@@ -336,12 +336,6 @@ nouveau_render_mode(struct gl_context *ctx, GLenum mode)
        context_dirty(ctx, RENDER_MODE);
 }
 
-static void
-nouveau_scissor(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
-{
-       context_dirty(ctx, SCISSOR);
-}
-
 static void
 nouveau_shade_model(struct gl_context *ctx, GLenum mode)
 {
@@ -398,7 +392,7 @@ nouveau_tex_env(struct gl_context *ctx, GLenum target, GLenum pname,
 }
 
 static void
-nouveau_tex_parameter(struct gl_context *ctx, GLenum target,
+nouveau_tex_parameter(struct gl_context *ctx,
                      struct gl_texture_object *t, GLenum pname,
                      const GLfloat *params)
 {
@@ -471,6 +465,9 @@ nouveau_update_state(struct gl_context *ctx, GLbitfield new_state)
                        context_dirty_i(ctx, TEX_MAT, i);
        }
 
+       if (new_state & _NEW_SCISSOR)
+               context_dirty(ctx, SCISSOR);
+
        if (new_state & _NEW_VIEWPORT)
                context_dirty(ctx, VIEWPORT);
 
@@ -495,6 +492,7 @@ nouveau_update_state(struct gl_context *ctx, GLbitfield new_state)
 
        _swrast_InvalidateState(ctx, new_state);
        _tnl_InvalidateState(ctx, new_state);
+       _vbo_InvalidateState(ctx, new_state);
 
        nouveau_state_emit(ctx);
 }
@@ -530,7 +528,6 @@ nouveau_state_init(struct gl_context *ctx)
        ctx->Driver.PolygonOffset = nouveau_polygon_offset;
        ctx->Driver.PolygonStipple = nouveau_polygon_stipple;
        ctx->Driver.RenderMode = nouveau_render_mode;
-       ctx->Driver.Scissor = nouveau_scissor;
        ctx->Driver.ShadeModel = nouveau_shade_model;
        ctx->Driver.StencilFuncSeparate = nouveau_stencil_func_separate;
        ctx->Driver.StencilMaskSeparate = nouveau_stencil_mask_separate;