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/r200 | |
| 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/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 2326c75dbd..2b61098cc9 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -104,12 +104,15 @@ static void r200AlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref ) rmesa->hw.ctx.cmd[CTX_PP_MISC] = pp_misc; } -static void r200BlendEquation( GLcontext *ctx, GLenum mode ) +static void r200BlendEquationSeparate( GLcontext *ctx, + GLenum modeRGB, GLenum modeA ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); GLuint b = rmesa->hw.ctx.cmd[CTX_RB3D_BLENDCNTL] & ~R200_COMB_FCN_MASK; - switch ( mode ) { + assert( modeRGB == modeA ); + + switch ( modeRGB ) { case GL_FUNC_ADD: case GL_LOGIC_OP: b |= R200_COMB_FCN_ADD_CLAMP; @@ -2186,7 +2189,7 @@ void r200InitStateFuncs( struct dd_function_table *functions ) functions->ReadBuffer = r200ReadBuffer; functions->AlphaFunc = r200AlphaFunc; - functions->BlendEquation = r200BlendEquation; + functions->BlendEquationSeparate = r200BlendEquationSeparate; functions->BlendFuncSeparate = r200BlendFuncSeparate; functions->ClearColor = r200ClearColor; functions->ClearDepth = NULL; |