diff options
| author | Brian Paul <[email protected]> | 2011-03-11 09:25:21 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-03-11 09:25:21 -0700 |
| commit | decc6e2a32ef49e673c081f30e19b8970155d887 (patch) | |
| tree | 463640956b098e3fd16af78694c2d48c07f23e95 /src/mesa/main/state.c | |
| parent | 4293a12c7f0d4fd7ac3a278570f3fe55fc4433a6 (diff) | |
mesa: replace NEED_SECONDARY_COLOR(), RGBA_LOGICOP_ENABLED() with inlines
and rename them.
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 502c429294c..19c9bbabda2 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -53,7 +53,7 @@ static void update_separate_specular(struct gl_context *ctx) { - if (NEED_SECONDARY_COLOR(ctx)) + if (_mesa_need_secondary_color(ctx)) ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR; else ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR; @@ -442,7 +442,7 @@ update_color(struct gl_context *ctx) /* This is needed to support 1.1's RGB logic ops AND * 1.0's blending logicops. */ - ctx->Color._LogicOpEnabled = RGBA_LOGICOP_ENABLED(ctx); + ctx->Color._LogicOpEnabled = _mesa_rgba_logicop_enabled(ctx); } @@ -524,7 +524,7 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state) ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE; if (ctx->Light.ShadeModel == GL_FLAT) ctx->_TriangleCaps |= DD_FLATSHADE; - if (NEED_SECONDARY_COLOR(ctx)) + if (_mesa_need_secondary_color(ctx)) ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR; /* |