diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-01-27 18:52:40 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-01-27 18:52:40 +0000 |
| commit | c93105eb9e2499efb237fd89dba0cebd48f18375 (patch) | |
| tree | e105eeceae3f57be1b583e51957d6f39038fed34 /src/mesa/drivers/dri/r128 | |
| parent | dd9e6e7e37fbb8c30c8085ed784539d94110aa3e (diff) | |
Added support for EXT_blend_equation_separate / ATI_blend_equation_separate.
The internal driver interface was also changed to use
BlendEquationSeparate instead of BlendEquation.
Diffstat (limited to 'src/mesa/drivers/dri/r128')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_state.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_state.c b/src/mesa/drivers/dri/r128/r128_state.c index 0be7b1bfa8..8ed63dafe9 100644 --- a/src/mesa/drivers/dri/r128/r128_state.c +++ b/src/mesa/drivers/dri/r128/r128_state.c @@ -191,10 +191,12 @@ static void r128DDAlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref ) rmesa->new_state |= R128_NEW_ALPHA; } -static void r128DDBlendEquation( GLcontext *ctx, GLenum mode ) +static void r128DDBlendEquationSeparate( GLcontext *ctx, + GLenum modeRGB, GLenum modeA ) { r128ContextPtr rmesa = R128_CONTEXT(ctx); + assert( modeRGB == modeA ); FLUSH_BATCH( rmesa ); /* BlendEquation sets ColorLogicOpEnabled in an unexpected @@ -206,7 +208,7 @@ static void r128DDBlendEquation( GLcontext *ctx, GLenum mode ) /* Can only do blend addition, not min, max, subtract, etc. */ FALLBACK( R128_CONTEXT(ctx), R128_FALLBACK_BLEND_EQ, - mode != GL_FUNC_ADD_EXT); + modeRGB != GL_FUNC_ADD); rmesa->new_state |= R128_NEW_ALPHA; } @@ -1187,7 +1189,7 @@ void r128DDInitStateFuncs( GLcontext *ctx ) ctx->Driver.IndexMask = NULL; ctx->Driver.ColorMask = r128DDColorMask; ctx->Driver.AlphaFunc = r128DDAlphaFunc; - ctx->Driver.BlendEquation = r128DDBlendEquation; + ctx->Driver.BlendEquationSeparate = r128DDBlendEquationSeparate; ctx->Driver.BlendFuncSeparate = r128DDBlendFuncSeparate; ctx->Driver.ClearDepth = r128DDClearDepth; ctx->Driver.CullFace = r128DDCullFace; |