diff options
| author | Brian Paul <[email protected]> | 2012-06-26 14:47:19 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-06-27 07:50:56 -0600 |
| commit | 4cb3579e52fed48d623698610e31d05ac8c8946f (patch) | |
| tree | cfe51fe403ff2d16fae4e76dda8f418a18475b03 /src/mesa/drivers/dri/nouveau | |
| parent | b114ff3783c1aff636c4293eccfc9e04b802d3bf (diff) | |
mesa: rename ColorMaterialBitmask to _ColorMaterialBitmask
Since it's a derived field.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_tnl.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv20_state_tnl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c index a239f88cdcd..06155fe011c 100644 --- 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) diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c b/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c index 181f3fe2e02..1d3d83d47fc 100644 --- a/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c +++ b/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c @@ -89,7 +89,7 @@ void nv20_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, NV20_3D(COLOR_MATERIAL), 1); PUSH_DATA (push, ctx->Light.ColorMaterialEnabled ? mask : 0); @@ -229,7 +229,7 @@ nv20_emit_light_source(struct gl_context *ctx, int emit) #define USE_COLOR_MATERIAL(attr, side) \ (ctx->Light.ColorMaterialEnabled && \ - ctx->Light.ColorMaterialBitmask & (1 << MAT_ATTRIB_##attr(side))) + ctx->Light._ColorMaterialBitmask & (1 << MAT_ATTRIB_##attr(side))) void nv20_emit_material_ambient(struct gl_context *ctx, int emit) |