From 20a17e42d7fc9fe65aabe612fe1e513c3103d121 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 21 Jan 2004 16:08:43 +0000 Subject: Remove dd_function_table::BlendFunc. All drivers now use dd_function_table:BlendFuncSeparate. If a driver does not actually support EXT_blend_func_separate, it can assume that the RGB and alpha blend functions are the same. --- src/mesa/drivers/dri/radeon/radeon_state.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/mesa/drivers/dri/radeon') diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 49d98a67e7..e71f5adf27 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -138,7 +138,9 @@ static void radeonBlendEquation( GLcontext *ctx, GLenum mode ) } } -static void radeonBlendFunc( GLcontext *ctx, GLenum sfactor, GLenum dfactor ) +static void radeonBlendFuncSeparate( GLcontext *ctx, + GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA ) { radeonContextPtr rmesa = RADEON_CONTEXT(ctx); GLuint b = rmesa->hw.ctx.cmd[CTX_RB3D_BLENDCNTL] & @@ -243,13 +245,6 @@ static void radeonBlendFunc( GLcontext *ctx, GLenum sfactor, GLenum dfactor ) } } -static void radeonBlendFuncSeparate( GLcontext *ctx, - GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA ) -{ - radeonBlendFunc( ctx, sfactorRGB, dfactorRGB ); -} - /* ============================================================= * Depth testing @@ -1686,8 +1681,10 @@ static void radeonEnable( GLcontext *ctx, GLenum cap, GLboolean state ) */ if (state) { ctx->Driver.BlendEquation( ctx, ctx->Color.BlendEquation ); - ctx->Driver.BlendFunc( ctx, ctx->Color.BlendSrcRGB, - ctx->Color.BlendDstRGB ); + ctx->Driver.BlendFuncSeparate( ctx, ctx->Color.BlendSrcRGB, + ctx->Color.BlendDstRGB, + ctx->Color.BlendSrcRGB, + ctx->Color.BlendDstRGB ); } else { FALLBACK( rmesa, RADEON_FALLBACK_BLEND_FUNC, GL_FALSE ); @@ -2178,7 +2175,6 @@ void radeonInitStateFuncs( GLcontext *ctx ) ctx->Driver.AlphaFunc = radeonAlphaFunc; ctx->Driver.BlendEquation = radeonBlendEquation; - ctx->Driver.BlendFunc = radeonBlendFunc; ctx->Driver.BlendFuncSeparate = radeonBlendFuncSeparate; ctx->Driver.ClearColor = radeonClearColor; ctx->Driver.ClearDepth = radeonClearDepth; -- cgit v1.2.3