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/i810/i810state.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/mesa/drivers/dri/i810') diff --git a/src/mesa/drivers/dri/i810/i810state.c b/src/mesa/drivers/dri/i810/i810state.c index 23432b2c072..9249d0841a0 100644 --- a/src/mesa/drivers/dri/i810/i810state.c +++ b/src/mesa/drivers/dri/i810/i810state.c @@ -88,7 +88,9 @@ static void i810BlendEquation(GLcontext *ctx, GLenum mode) ctx->Color.LogicOp != GL_COPY)); } -static void i810BlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor) +static void i810BlendFuncSeparate( GLcontext *ctx, GLenum sfactorRGB, + GLenum dfactorRGB, GLenum sfactorA, + GLenum dfactorA ) { i810ContextPtr imesa = I810_CONTEXT(ctx); GLuint a = SDM_UPDATE_SRC_BLEND | SDM_UPDATE_DST_BLEND; @@ -142,20 +144,6 @@ static void i810BlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor) } -/* Shouldn't be called as the extension is disabled. - */ -static void i810BlendFuncSeparate( GLcontext *ctx, GLenum sfactorRGB, - GLenum dfactorRGB, GLenum sfactorA, - GLenum dfactorA ) -{ - if (dfactorRGB != dfactorA || sfactorRGB != sfactorA) { - _mesa_error( ctx, GL_INVALID_OPERATION, "glBlendEquation (disabled)"); - } - - i810BlendFunc( ctx, sfactorRGB, dfactorRGB ); -} - - static void i810DepthFunc(GLcontext *ctx, GLenum func) { @@ -974,7 +962,6 @@ void i810InitStateFuncs(GLcontext *ctx) */ ctx->Driver.AlphaFunc = i810AlphaFunc; ctx->Driver.BlendEquation = i810BlendEquation; - ctx->Driver.BlendFunc = i810BlendFunc; ctx->Driver.BlendFuncSeparate = i810BlendFuncSeparate; ctx->Driver.ClearColor = i810ClearColor; ctx->Driver.ColorMask = i810ColorMask; -- cgit v1.2.3