i965/gs: implement EndPrimitive() functionality in the visitor.

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

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
index a239f88cdcdb6b7c6cf7925d49d05650cd5c1e11..06155fe011cbda03ff830d9c82c8844bd29b41bb 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
@@ -57,7 +57,7 @@ void
 nv10_emit_color_material(struct gl_context *ctx, int emit)
 {
        struct nouveau_pushbuf *push = context_push(ctx);
-       unsigned mask = get_material_bitmask(ctx->Light.ColorMaterialBitmask);
+       unsigned mask = get_material_bitmask(ctx->Light._ColorMaterialBitmask);
 
        BEGIN_NV04(push, NV10_3D(COLOR_MATERIAL), 1);
        PUSH_DATA (push, ctx->Light.ColorMaterialEnabled ? mask : 0);
@@ -313,7 +313,7 @@ nv10_emit_light_source(struct gl_context *ctx, int emit)
 
 #define USE_COLOR_MATERIAL(attr)                                       \
        (ctx->Light.ColorMaterialEnabled &&                             \
-        ctx->Light.ColorMaterialBitmask & (1 << MAT_ATTRIB_FRONT_##attr))
+        ctx->Light._ColorMaterialBitmask & (1 << MAT_ATTRIB_FRONT_##attr))
 
 void
 nv10_emit_material_ambient(struct gl_context *ctx, int emit)