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/ffb | |
| 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/ffb')
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_state.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c index ddda946f4b..eef7af4e5d 100644 --- a/src/mesa/drivers/dri/ffb/ffb_state.c +++ b/src/mesa/drivers/dri/ffb/ffb_state.c @@ -93,13 +93,16 @@ static void ffbDDAlphaFunc(GLcontext *ctx, GLenum func, GLfloat ref) } } -static void ffbDDBlendEquation(GLcontext *ctx, GLenum mode) +static void ffbDDBlendEquationSeparate(GLcontext *ctx, + GLenum modeRGB, GLenum modeA) { #ifdef STATE_TRACE - fprintf(stderr, "ffbDDBlendEquation: mode(%s)\n", _mesa_lookup_enum_by_nr(mode)); + fprintf(stderr, "ffbDDBlendEquation: mode(%s)\n", + _mesa_lookup_enum_by_nr(modeRGB)); #endif - FALLBACK( ctx, (mode != GL_FUNC_ADD_EXT), FFB_BADATTR_BLENDEQN); + assert( modeRGB == modeA ); + FALLBACK( ctx, (modeRGB != GL_FUNC_ADD), FFB_BADATTR_BLENDEQN); } static void ffbDDBlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB, @@ -1052,7 +1055,7 @@ void ffbDDInitStateFuncs(GLcontext *ctx) ctx->Driver.Enable = ffbDDEnable; ctx->Driver.AlphaFunc = ffbDDAlphaFunc; - ctx->Driver.BlendEquation = ffbDDBlendEquation; + ctx->Driver.BlendEquationSeparate = ffbDDBlendEquationSeparate; ctx->Driver.BlendFuncSeparate = ffbDDBlendFuncSeparate; ctx->Driver.DepthFunc = ffbDDDepthFunc; ctx->Driver.DepthMask = ffbDDDepthMask; |