X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fblend.c;h=34e8d11569db8a34aeff12994549405db8d9d667;hb=b68ff2b8731427b3b68c9c81902f7ba93606caaf;hp=1638417d1265862ddcf3edaceab02248606a3ae3;hpb=379255298f8fa9d9d8d53bf8898345fdd4fd0222;p=mesa.git diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 1638417d126..34e8d11569d 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -67,7 +67,7 @@ legal_src_factor(const struct gl_context *ctx, GLenum factor) case GL_SRC1_ALPHA: case GL_ONE_MINUS_SRC1_COLOR: case GL_ONE_MINUS_SRC1_ALPHA: - return _mesa_is_desktop_gl(ctx) + return ctx->API != API_OPENGLES && ctx->Extensions.ARB_blend_func_extended; default: return GL_FALSE; @@ -100,14 +100,14 @@ legal_dst_factor(const struct gl_context *ctx, GLenum factor) case GL_ONE_MINUS_CONSTANT_ALPHA: return _mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES2; case GL_SRC_ALPHA_SATURATE: - return (_mesa_is_desktop_gl(ctx) + return (ctx->API != API_OPENGLES && ctx->Extensions.ARB_blend_func_extended) || _mesa_is_gles3(ctx); case GL_SRC1_COLOR: case GL_SRC1_ALPHA: case GL_ONE_MINUS_SRC1_COLOR: case GL_ONE_MINUS_SRC1_ALPHA: - return _mesa_is_desktop_gl(ctx) + return ctx->API != API_OPENGLES && ctx->Extensions.ARB_blend_func_extended; default: return GL_FALSE; @@ -157,20 +157,6 @@ validate_blend_factors(struct gl_context *ctx, const char *func, } -/** - * Specify the blending operation. - * - * \param sfactor source factor operator. - * \param dfactor destination factor operator. - * - * \sa glBlendFunc, glBlendFuncSeparateEXT - */ -void GLAPIENTRY -_mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) -{ - _mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor); -} - static GLboolean blend_factor_is_dual_src(GLenum factor) { @@ -190,6 +176,120 @@ update_uses_dual_src(struct gl_context *ctx, int buf) blend_factor_is_dual_src(ctx->Color.Blend[buf].DstA)); } + +/** + * Return the number of per-buffer blend states to update in + * glBlendFunc, glBlendFuncSeparate, glBlendEquation, etc. + */ +static inline unsigned +num_buffers(const struct gl_context *ctx) +{ + return ctx->Extensions.ARB_draw_buffers_blend + ? ctx->Const.MaxDrawBuffers : 1; +} + + +/* Returns true if there was no change */ +static bool +skip_blend_state_update(const struct gl_context *ctx, + GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) +{ + /* Check if we're really changing any state. If not, return early. */ + if (ctx->Color._BlendFuncPerBuffer) { + const unsigned numBuffers = num_buffers(ctx); + + /* Check all per-buffer states */ + for (unsigned buf = 0; buf < numBuffers; buf++) { + if (ctx->Color.Blend[buf].SrcRGB != sfactorRGB || + ctx->Color.Blend[buf].DstRGB != dfactorRGB || + ctx->Color.Blend[buf].SrcA != sfactorA || + ctx->Color.Blend[buf].DstA != dfactorA) { + return false; + } + } + } + else { + /* only need to check 0th per-buffer state */ + if (ctx->Color.Blend[0].SrcRGB != sfactorRGB || + ctx->Color.Blend[0].DstRGB != dfactorRGB || + ctx->Color.Blend[0].SrcA != sfactorA || + ctx->Color.Blend[0].DstA != dfactorA) { + return false; + } + } + + return true; +} + + +static void +blend_func_separate(struct gl_context *ctx, + GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) +{ + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlend ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewBlend; + + const unsigned numBuffers = num_buffers(ctx); + for (unsigned buf = 0; buf < numBuffers; buf++) { + ctx->Color.Blend[buf].SrcRGB = sfactorRGB; + ctx->Color.Blend[buf].DstRGB = dfactorRGB; + ctx->Color.Blend[buf].SrcA = sfactorA; + ctx->Color.Blend[buf].DstA = dfactorA; + } + + update_uses_dual_src(ctx, 0); + for (unsigned buf = 1; buf < numBuffers; buf++) { + ctx->Color.Blend[buf]._UsesDualSrc = ctx->Color.Blend[0]._UsesDualSrc; + } + + ctx->Color._BlendFuncPerBuffer = GL_FALSE; + + if (ctx->Driver.BlendFuncSeparate) { + ctx->Driver.BlendFuncSeparate(ctx, sfactorRGB, dfactorRGB, + sfactorA, dfactorA); + } +} + + +/** + * Specify the blending operation. + * + * \param sfactor source factor operator. + * \param dfactor destination factor operator. + * + * \sa glBlendFunc, glBlendFuncSeparateEXT + */ +void GLAPIENTRY +_mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) +{ + GET_CURRENT_CONTEXT(ctx); + + if (skip_blend_state_update(ctx, sfactor, dfactor, sfactor, dfactor)) + return; + + if (!validate_blend_factors(ctx, "glBlendFunc", + sfactor, dfactor, sfactor, dfactor)) { + return; + } + + blend_func_separate(ctx, sfactor, dfactor, sfactor, dfactor); +} + + +void GLAPIENTRY +_mesa_BlendFunc_no_error(GLenum sfactor, GLenum dfactor) +{ + GET_CURRENT_CONTEXT(ctx); + + if (skip_blend_state_update(ctx, sfactor, dfactor, sfactor, dfactor)) + return; + + blend_func_separate(ctx, sfactor, dfactor, sfactor, dfactor); +} + + /** * Set the separate blend source/dest factors for all draw buffers. * @@ -202,8 +302,6 @@ void GLAPIENTRY _mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ) { - GLuint buf, numBuffers; - GLboolean changed; GET_CURRENT_CONTEXT(ctx); if (MESA_VERBOSE & VERBOSE_API) @@ -213,43 +311,39 @@ _mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, _mesa_enum_to_string(sfactorA), _mesa_enum_to_string(dfactorA)); + + + if (skip_blend_state_update(ctx, sfactorRGB, dfactorRGB, sfactorA, dfactorA)) + return; + if (!validate_blend_factors(ctx, "glBlendFuncSeparate", sfactorRGB, dfactorRGB, sfactorA, dfactorA)) { return; } - numBuffers = ctx->Extensions.ARB_draw_buffers_blend - ? ctx->Const.MaxDrawBuffers : 1; + blend_func_separate(ctx, sfactorRGB, dfactorRGB, sfactorA, dfactorA); +} - changed = GL_FALSE; - for (buf = 0; buf < numBuffers; buf++) { - if (ctx->Color.Blend[buf].SrcRGB != sfactorRGB || - ctx->Color.Blend[buf].DstRGB != dfactorRGB || - ctx->Color.Blend[buf].SrcA != sfactorA || - ctx->Color.Blend[buf].DstA != dfactorA) { - changed = GL_TRUE; - break; - } - } - if (!changed) + +void GLAPIENTRY +_mesa_BlendFuncSeparate_no_error(GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) +{ + GET_CURRENT_CONTEXT(ctx); + + if (skip_blend_state_update(ctx, sfactorRGB, dfactorRGB, sfactorA, dfactorA)) return; - FLUSH_VERTICES(ctx, _NEW_COLOR); + blend_func_separate(ctx, sfactorRGB, dfactorRGB, sfactorA, dfactorA); +} - for (buf = 0; buf < numBuffers; buf++) { - ctx->Color.Blend[buf].SrcRGB = sfactorRGB; - ctx->Color.Blend[buf].DstRGB = dfactorRGB; - ctx->Color.Blend[buf].SrcA = sfactorA; - ctx->Color.Blend[buf].DstA = dfactorA; - update_uses_dual_src(ctx, buf); - } - ctx->Color._BlendFuncPerBuffer = GL_FALSE; - if (ctx->Driver.BlendFuncSeparate) { - ctx->Driver.BlendFuncSeparate(ctx, sfactorRGB, dfactorRGB, - sfactorA, dfactorA); - } +void GLAPIENTRY +_mesa_BlendFunciARB_no_error(GLuint buf, GLenum sfactor, GLenum dfactor) +{ + _mesa_BlendFuncSeparateiARB_no_error(buf, sfactor, dfactor, sfactor, + dfactor); } @@ -263,30 +357,23 @@ _mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor) } -/** - * Set separate blend source/dest factors for one color buffer/target. - */ -void GLAPIENTRY -_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA) +static ALWAYS_INLINE void +blend_func_separatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA, bool no_error) { GET_CURRENT_CONTEXT(ctx); - if (!ctx->Extensions.ARB_draw_buffers_blend) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glBlendFunc[Separate]i()"); - return; - } - - if (buf >= ctx->Const.MaxDrawBuffers) { - _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)", - buf); - return; - } + if (!no_error) { + if (!ctx->Extensions.ARB_draw_buffers_blend) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glBlendFunc[Separate]i()"); + return; + } - if (!validate_blend_factors(ctx, "glBlendFuncSeparatei", - sfactorRGB, dfactorRGB, - sfactorA, dfactorA)) { - return; + if (buf >= ctx->Const.MaxDrawBuffers) { + _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)", + buf); + return; + } } if (ctx->Color.Blend[buf].SrcRGB == sfactorRGB && @@ -295,7 +382,14 @@ _mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, ctx->Color.Blend[buf].DstA == dfactorA) return; /* no change */ - FLUSH_VERTICES(ctx, _NEW_COLOR); + if (!no_error && !validate_blend_factors(ctx, "glBlendFuncSeparatei", + sfactorRGB, dfactorRGB, + sfactorA, dfactorA)) { + return; + } + + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlend ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewBlend; ctx->Color.Blend[buf].SrcRGB = sfactorRGB; ctx->Color.Blend[buf].DstRGB = dfactorRGB; @@ -306,12 +400,34 @@ _mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, } +void GLAPIENTRY +_mesa_BlendFuncSeparateiARB_no_error(GLuint buf, GLenum sfactorRGB, + GLenum dfactorRGB, GLenum sfactorA, + GLenum dfactorA) +{ + blend_func_separatei(buf, sfactorRGB, dfactorRGB, sfactorA, dfactorA, + true); +} + + /** - * Check if given blend equation is legal. - * \return GL_TRUE if legal, GL_FALSE otherwise. + * Set separate blend source/dest factors for one color buffer/target. */ -static GLboolean -legal_blend_equation(const struct gl_context *ctx, GLenum mode) +void GLAPIENTRY +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) +{ + blend_func_separatei(buf, sfactorRGB, dfactorRGB, sfactorA, dfactorA, + false); +} + + +/** + * Return true if \p mode is a legal blending equation, excluding + * GL_KHR_blend_equation_advanced modes. + */ +static bool +legal_simple_blend_equation(const struct gl_context *ctx, GLenum mode) { switch (mode) { case GL_FUNC_ADD: @@ -326,138 +442,303 @@ legal_blend_equation(const struct gl_context *ctx, GLenum mode) } } +static enum gl_advanced_blend_mode +advanced_blend_mode_from_gl_enum(GLenum mode) +{ + switch (mode) { + case GL_MULTIPLY_KHR: + return BLEND_MULTIPLY; + case GL_SCREEN_KHR: + return BLEND_SCREEN; + case GL_OVERLAY_KHR: + return BLEND_OVERLAY; + case GL_DARKEN_KHR: + return BLEND_DARKEN; + case GL_LIGHTEN_KHR: + return BLEND_LIGHTEN; + case GL_COLORDODGE_KHR: + return BLEND_COLORDODGE; + case GL_COLORBURN_KHR: + return BLEND_COLORBURN; + case GL_HARDLIGHT_KHR: + return BLEND_HARDLIGHT; + case GL_SOFTLIGHT_KHR: + return BLEND_SOFTLIGHT; + case GL_DIFFERENCE_KHR: + return BLEND_DIFFERENCE; + case GL_EXCLUSION_KHR: + return BLEND_EXCLUSION; + case GL_HSL_HUE_KHR: + return BLEND_HSL_HUE; + case GL_HSL_SATURATION_KHR: + return BLEND_HSL_SATURATION; + case GL_HSL_COLOR_KHR: + return BLEND_HSL_COLOR; + case GL_HSL_LUMINOSITY_KHR: + return BLEND_HSL_LUMINOSITY; + default: + return BLEND_NONE; + } +} + +/** + * If \p mode is one of the advanced blending equations defined by + * GL_KHR_blend_equation_advanced (and the extension is supported), + * return the corresponding BLEND_* enum. Otherwise, return BLEND_NONE + * (which can also be treated as false). + */ +static enum gl_advanced_blend_mode +advanced_blend_mode(const struct gl_context *ctx, GLenum mode) +{ + return _mesa_has_KHR_blend_equation_advanced(ctx) ? + advanced_blend_mode_from_gl_enum(mode) : BLEND_NONE; +} /* This is really an extension function! */ void GLAPIENTRY _mesa_BlendEquation( GLenum mode ) { - GLuint buf, numBuffers; - GLboolean changed; GET_CURRENT_CONTEXT(ctx); + const unsigned numBuffers = num_buffers(ctx); + unsigned buf; + bool changed = false; + enum gl_advanced_blend_mode advanced_mode = advanced_blend_mode(ctx, mode); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glBlendEquation(%s)\n", _mesa_enum_to_string(mode)); - if (!legal_blend_equation(ctx, mode)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation"); - return; + if (ctx->Color._BlendEquationPerBuffer) { + /* Check all per-buffer states */ + for (buf = 0; buf < numBuffers; buf++) { + if (ctx->Color.Blend[buf].EquationRGB != mode || + ctx->Color.Blend[buf].EquationA != mode) { + changed = true; + break; + } + } } - - numBuffers = ctx->Extensions.ARB_draw_buffers_blend - ? ctx->Const.MaxDrawBuffers : 1; - - changed = GL_FALSE; - for (buf = 0; buf < numBuffers; buf++) { - if (ctx->Color.Blend[buf].EquationRGB != mode || - ctx->Color.Blend[buf].EquationA != mode) { - changed = GL_TRUE; - break; + else { + /* only need to check 0th per-buffer state */ + if (ctx->Color.Blend[0].EquationRGB != mode || + ctx->Color.Blend[0].EquationA != mode) { + changed = true; } } + if (!changed) return; - FLUSH_VERTICES(ctx, _NEW_COLOR); + + if (!legal_simple_blend_equation(ctx, mode) && !advanced_mode) { + _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation"); + return; + } + + _mesa_flush_vertices_for_blend_adv(ctx, ctx->Color.BlendEnabled, + advanced_mode); + for (buf = 0; buf < numBuffers; buf++) { ctx->Color.Blend[buf].EquationRGB = mode; ctx->Color.Blend[buf].EquationA = mode; } ctx->Color._BlendEquationPerBuffer = GL_FALSE; + ctx->Color._AdvancedBlendMode = advanced_mode; if (ctx->Driver.BlendEquationSeparate) - (*ctx->Driver.BlendEquationSeparate)( ctx, mode, mode ); + ctx->Driver.BlendEquationSeparate(ctx, mode, mode); } /** * Set blend equation for one color buffer/target. */ +static void +blend_equationi(struct gl_context *ctx, GLuint buf, GLenum mode, + enum gl_advanced_blend_mode advanced_mode) +{ + if (ctx->Color.Blend[buf].EquationRGB == mode && + ctx->Color.Blend[buf].EquationA == mode) + return; /* no change */ + + _mesa_flush_vertices_for_blend_adv(ctx, ctx->Color.BlendEnabled, + advanced_mode); + ctx->Color.Blend[buf].EquationRGB = mode; + ctx->Color.Blend[buf].EquationA = mode; + ctx->Color._BlendEquationPerBuffer = GL_TRUE; + + if (buf == 0) + ctx->Color._AdvancedBlendMode = advanced_mode; +} + + +void GLAPIENTRY +_mesa_BlendEquationiARB_no_error(GLuint buf, GLenum mode) +{ + GET_CURRENT_CONTEXT(ctx); + + enum gl_advanced_blend_mode advanced_mode = advanced_blend_mode(ctx, mode); + blend_equationi(ctx, buf, mode, advanced_mode); +} + + void GLAPIENTRY _mesa_BlendEquationiARB(GLuint buf, GLenum mode) { GET_CURRENT_CONTEXT(ctx); + enum gl_advanced_blend_mode advanced_mode = advanced_blend_mode(ctx, mode); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glBlendEquationi(%u, %s)\n", buf, _mesa_enum_to_string(mode)); if (buf >= ctx->Const.MaxDrawBuffers) { - _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)", + _mesa_error(ctx, GL_INVALID_VALUE, "glBlendEquationi(buffer=%u)", buf); return; } - if (!legal_blend_equation(ctx, mode)) { + if (!legal_simple_blend_equation(ctx, mode) && !advanced_mode) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationi"); return; } - if (ctx->Color.Blend[buf].EquationRGB == mode && - ctx->Color.Blend[buf].EquationA == mode) - return; /* no change */ - - FLUSH_VERTICES(ctx, _NEW_COLOR); - ctx->Color.Blend[buf].EquationRGB = mode; - ctx->Color.Blend[buf].EquationA = mode; - ctx->Color._BlendEquationPerBuffer = GL_TRUE; + blend_equationi(ctx, buf, mode, advanced_mode); } -void GLAPIENTRY -_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ) +static void +blend_equation_separate(struct gl_context *ctx, GLenum modeRGB, GLenum modeA, + bool no_error) { - GLuint buf, numBuffers; - GLboolean changed; - GET_CURRENT_CONTEXT(ctx); - - if (MESA_VERBOSE & VERBOSE_API) - _mesa_debug(ctx, "glBlendEquationSeparateEXT(%s %s)\n", - _mesa_enum_to_string(modeRGB), - _mesa_enum_to_string(modeA)); - - if ( (modeRGB != modeA) && !ctx->Extensions.EXT_blend_equation_separate ) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glBlendEquationSeparateEXT not supported by driver"); - return; + const unsigned numBuffers = num_buffers(ctx); + unsigned buf; + bool changed = false; + + if (ctx->Color._BlendEquationPerBuffer) { + /* Check all per-buffer states */ + for (buf = 0; buf < numBuffers; buf++) { + if (ctx->Color.Blend[buf].EquationRGB != modeRGB || + ctx->Color.Blend[buf].EquationA != modeA) { + changed = true; + break; + } + } + } else { + /* only need to check 0th per-buffer state */ + if (ctx->Color.Blend[0].EquationRGB != modeRGB || + ctx->Color.Blend[0].EquationA != modeA) { + changed = true; + } } - if (!legal_blend_equation(ctx, modeRGB)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)"); + if (!changed) return; - } - if (!legal_blend_equation(ctx, modeA)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)"); - return; - } + if (!no_error) { + if ((modeRGB != modeA) && !ctx->Extensions.EXT_blend_equation_separate) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBlendEquationSeparateEXT not supported by driver"); + return; + } - numBuffers = ctx->Extensions.ARB_draw_buffers_blend - ? ctx->Const.MaxDrawBuffers : 1; + /* Only allow simple blending equations. + * The GL_KHR_blend_equation_advanced spec says: + * + * "NOTE: These enums are not accepted by the or + * parameters of BlendEquationSeparate or BlendEquationSeparatei." + */ + if (!legal_simple_blend_equation(ctx, modeRGB)) { + _mesa_error(ctx, GL_INVALID_ENUM, + "glBlendEquationSeparateEXT(modeRGB)"); + return; + } - changed = GL_FALSE; - for (buf = 0; buf < numBuffers; buf++) { - if (ctx->Color.Blend[buf].EquationRGB != modeRGB || - ctx->Color.Blend[buf].EquationA != modeA) { - changed = GL_TRUE; - break; + if (!legal_simple_blend_equation(ctx, modeA)) { + _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)"); + return; } } - if (!changed) - return; - FLUSH_VERTICES(ctx, _NEW_COLOR); + _mesa_flush_vertices_for_blend_state(ctx); + for (buf = 0; buf < numBuffers; buf++) { ctx->Color.Blend[buf].EquationRGB = modeRGB; ctx->Color.Blend[buf].EquationA = modeA; } ctx->Color._BlendEquationPerBuffer = GL_FALSE; + ctx->Color._AdvancedBlendMode = BLEND_NONE; if (ctx->Driver.BlendEquationSeparate) ctx->Driver.BlendEquationSeparate(ctx, modeRGB, modeA); } +void GLAPIENTRY +_mesa_BlendEquationSeparate_no_error(GLenum modeRGB, GLenum modeA) +{ + GET_CURRENT_CONTEXT(ctx); + blend_equation_separate(ctx, modeRGB, modeA, true); +} + + +void GLAPIENTRY +_mesa_BlendEquationSeparate(GLenum modeRGB, GLenum modeA) +{ + GET_CURRENT_CONTEXT(ctx); + + if (MESA_VERBOSE & VERBOSE_API) + _mesa_debug(ctx, "glBlendEquationSeparateEXT(%s %s)\n", + _mesa_enum_to_string(modeRGB), + _mesa_enum_to_string(modeA)); + + blend_equation_separate(ctx, modeRGB, modeA, false); +} + + +static ALWAYS_INLINE void +blend_equation_separatei(struct gl_context *ctx, GLuint buf, GLenum modeRGB, + GLenum modeA, bool no_error) +{ + if (ctx->Color.Blend[buf].EquationRGB == modeRGB && + ctx->Color.Blend[buf].EquationA == modeA) + return; /* no change */ + + if (!no_error) { + /* Only allow simple blending equations. + * The GL_KHR_blend_equation_advanced spec says: + * + * "NOTE: These enums are not accepted by the or + * parameters of BlendEquationSeparate or BlendEquationSeparatei." + */ + if (!legal_simple_blend_equation(ctx, modeRGB)) { + _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeRGB)"); + return; + } + + if (!legal_simple_blend_equation(ctx, modeA)) { + _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeA)"); + return; + } + } + + _mesa_flush_vertices_for_blend_state(ctx); + ctx->Color.Blend[buf].EquationRGB = modeRGB; + ctx->Color.Blend[buf].EquationA = modeA; + ctx->Color._BlendEquationPerBuffer = GL_TRUE; + ctx->Color._AdvancedBlendMode = BLEND_NONE; +} + + +void GLAPIENTRY +_mesa_BlendEquationSeparateiARB_no_error(GLuint buf, GLenum modeRGB, + GLenum modeA) +{ + GET_CURRENT_CONTEXT(ctx); + blend_equation_separatei(ctx, buf, modeRGB, modeA, true); +} + + /** * Set separate blend equations for one color buffer/target. */ @@ -477,24 +758,7 @@ _mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA) return; } - if (!legal_blend_equation(ctx, modeRGB)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeRGB)"); - return; - } - - if (!legal_blend_equation(ctx, modeA)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeA)"); - return; - } - - if (ctx->Color.Blend[buf].EquationRGB == modeRGB && - ctx->Color.Blend[buf].EquationA == modeA) - return; /* no change */ - - FLUSH_VERTICES(ctx, _NEW_COLOR); - ctx->Color.Blend[buf].EquationRGB = modeRGB; - ctx->Color.Blend[buf].EquationA = modeA; - ctx->Color._BlendEquationPerBuffer = GL_TRUE; + blend_equation_separatei(ctx, buf, modeRGB, modeA, false); } @@ -526,7 +790,8 @@ _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) if (TEST_EQ_4V(tmp, ctx->Color.BlendColorUnclamped)) return; - FLUSH_VERTICES(ctx, _NEW_COLOR); + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlendColor ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewBlendColor; COPY_4FV( ctx->Color.BlendColorUnclamped, tmp ); ctx->Color.BlendColor[0] = CLAMP(tmp[0], 0.0F, 1.0F); @@ -535,7 +800,7 @@ _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) ctx->Color.BlendColor[3] = CLAMP(tmp[3], 0.0F, 1.0F); if (ctx->Driver.BlendColor) - (*ctx->Driver.BlendColor)(ctx, ctx->Color.BlendColor); + ctx->Driver.BlendColor(ctx, ctx->Color.BlendColor); } @@ -570,7 +835,8 @@ _mesa_AlphaFunc( GLenum func, GLclampf ref ) case GL_NOTEQUAL: case GL_GEQUAL: case GL_ALWAYS: - FLUSH_VERTICES(ctx, _NEW_COLOR); + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewAlphaTest ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewAlphaTest; ctx->Color.AlphaFunc = func; ctx->Color.AlphaRefUnclamped = ref; ctx->Color.AlphaRef = CLAMP(ref, 0.0F, 1.0F); @@ -585,6 +851,65 @@ _mesa_AlphaFunc( GLenum func, GLclampf ref ) } } +static const enum gl_logicop_mode color_logicop_mapping[16] = { + COLOR_LOGICOP_CLEAR, + COLOR_LOGICOP_AND, + COLOR_LOGICOP_AND_REVERSE, + COLOR_LOGICOP_COPY, + COLOR_LOGICOP_AND_INVERTED, + COLOR_LOGICOP_NOOP, + COLOR_LOGICOP_XOR, + COLOR_LOGICOP_OR, + COLOR_LOGICOP_NOR, + COLOR_LOGICOP_EQUIV, + COLOR_LOGICOP_INVERT, + COLOR_LOGICOP_OR_REVERSE, + COLOR_LOGICOP_COPY_INVERTED, + COLOR_LOGICOP_OR_INVERTED, + COLOR_LOGICOP_NAND, + COLOR_LOGICOP_SET +}; + +static ALWAYS_INLINE void +logic_op(struct gl_context *ctx, GLenum opcode, bool no_error) +{ + if (ctx->Color.LogicOp == opcode) + return; + + if (!no_error) { + switch (opcode) { + case GL_CLEAR: + case GL_SET: + case GL_COPY: + case GL_COPY_INVERTED: + case GL_NOOP: + case GL_INVERT: + case GL_AND: + case GL_NAND: + case GL_OR: + case GL_NOR: + case GL_XOR: + case GL_EQUIV: + case GL_AND_REVERSE: + case GL_AND_INVERTED: + case GL_OR_REVERSE: + case GL_OR_INVERTED: + break; + default: + _mesa_error( ctx, GL_INVALID_ENUM, "glLogicOp" ); + return; + } + } + + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewLogicOp ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewLogicOp; + ctx->Color.LogicOp = opcode; + ctx->Color._LogicOp = color_logicop_mapping[opcode & 0x0f]; + + if (ctx->Driver.LogicOpcode) + ctx->Driver.LogicOpcode(ctx, ctx->Color._LogicOp); +} + /** * Specify a logic pixel operation for color index rendering. @@ -592,7 +917,7 @@ _mesa_AlphaFunc( GLenum func, GLclampf ref ) * \param opcode operation. * * Verifies that \p opcode is a valid enum and updates -gl_colorbuffer_attrib::LogicOp. + * gl_colorbuffer_attrib::LogicOp. * On a change, flushes the vertices and notifies the driver via the * dd_function_table::LogicOpcode callback. */ @@ -604,37 +929,15 @@ _mesa_LogicOp( GLenum opcode ) if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glLogicOp(%s)\n", _mesa_enum_to_string(opcode)); - switch (opcode) { - case GL_CLEAR: - case GL_SET: - case GL_COPY: - case GL_COPY_INVERTED: - case GL_NOOP: - case GL_INVERT: - case GL_AND: - case GL_NAND: - case GL_OR: - case GL_NOR: - case GL_XOR: - case GL_EQUIV: - case GL_AND_REVERSE: - case GL_AND_INVERTED: - case GL_OR_REVERSE: - case GL_OR_INVERTED: - break; - default: - _mesa_error( ctx, GL_INVALID_ENUM, "glLogicOp" ); - return; - } - - if (ctx->Color.LogicOp == opcode) - return; + logic_op(ctx, opcode, false); +} - FLUSH_VERTICES(ctx, _NEW_COLOR); - ctx->Color.LogicOp = opcode; - if (ctx->Driver.LogicOpcode) - ctx->Driver.LogicOpcode( ctx, opcode ); +void GLAPIENTRY +_mesa_LogicOp_no_error(GLenum opcode) +{ + GET_CURRENT_CONTEXT(ctx); + logic_op(ctx, opcode, true); } @@ -646,7 +949,8 @@ _mesa_IndexMask( GLuint mask ) if (ctx->Color.IndexMask == mask) return; - FLUSH_VERTICES(ctx, _NEW_COLOR); + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewColorMask ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewColorMask; ctx->Color.IndexMask = mask; } @@ -670,32 +974,23 @@ _mesa_ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) { GET_CURRENT_CONTEXT(ctx); - GLubyte tmp[4]; - GLuint i; - GLboolean flushed; if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glColorMask(%d, %d, %d, %d)\n", red, green, blue, alpha); - /* Shouldn't have any information about channel depth in core mesa - * -- should probably store these as the native booleans: - */ - tmp[RCOMP] = red ? 0xff : 0x0; - tmp[GCOMP] = green ? 0xff : 0x0; - tmp[BCOMP] = blue ? 0xff : 0x0; - tmp[ACOMP] = alpha ? 0xff : 0x0; - - flushed = GL_FALSE; - for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) { - if (!TEST_EQ_4V(tmp, ctx->Color.ColorMask[i])) { - if (!flushed) { - FLUSH_VERTICES(ctx, _NEW_COLOR); - } - flushed = GL_TRUE; - COPY_4UBV(ctx->Color.ColorMask[i], tmp); - } - } + GLbitfield mask = (!!red) | + ((!!green) << 1) | + ((!!blue) << 2) | + ((!!alpha) << 3); + mask = _mesa_replicate_colormask(mask, ctx->Const.MaxDrawBuffers); + + if (ctx->Color.ColorMask == mask) + return; + + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewColorMask ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewColorMask; + ctx->Color.ColorMask = mask; if (ctx->Driver.ColorMask) ctx->Driver.ColorMask( ctx, red, green, blue, alpha ); @@ -706,37 +1001,32 @@ _mesa_ColorMask( GLboolean red, GLboolean green, * For GL_EXT_draw_buffers2 and GL3 */ void GLAPIENTRY -_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, - GLboolean blue, GLboolean alpha ) +_mesa_ColorMaski(GLuint buf, GLboolean red, GLboolean green, + GLboolean blue, GLboolean alpha) { - GLubyte tmp[4]; GET_CURRENT_CONTEXT(ctx); if (MESA_VERBOSE & VERBOSE_API) - _mesa_debug(ctx, "glColorMaskIndexed %u %d %d %d %d\n", + _mesa_debug(ctx, "glColorMaski %u %d %d %d %d\n", buf, red, green, blue, alpha); if (buf >= ctx->Const.MaxDrawBuffers) { - _mesa_error(ctx, GL_INVALID_VALUE, "glColorMaskIndexed(buf=%u)", buf); + _mesa_error(ctx, GL_INVALID_VALUE, "glColorMaski(buf=%u)", buf); return; } - /* Shouldn't have any information about channel depth in core mesa - * -- should probably store these as the native booleans: - */ - tmp[RCOMP] = red ? 0xff : 0x0; - tmp[GCOMP] = green ? 0xff : 0x0; - tmp[BCOMP] = blue ? 0xff : 0x0; - tmp[ACOMP] = alpha ? 0xff : 0x0; + GLbitfield mask = (!!red) | + ((!!green) << 1) | + ((!!blue) << 2) | + ((!!alpha) << 3); - if (TEST_EQ_4V(tmp, ctx->Color.ColorMask[buf])) + if (GET_COLORMASK(ctx->Color.ColorMask, buf) == mask) return; - FLUSH_VERTICES(ctx, _NEW_COLOR); - COPY_4UBV(ctx->Color.ColorMask[buf], tmp); - - if (ctx->Driver.ColorMaskIndexed) - ctx->Driver.ColorMaskIndexed(ctx, buf, red, green, blue, alpha); + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewColorMask ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewColorMask; + ctx->Color.ColorMask &= ~(0xf << (4 * buf)); + ctx->Color.ColorMask |= mask << (4 * buf); } @@ -745,6 +1035,14 @@ _mesa_ClampColor(GLenum target, GLenum clamp) { GET_CURRENT_CONTEXT(ctx); + /* Check for both the extension and the GL version, since the Intel driver + * does not advertise the extension in core profiles. + */ + if (ctx->Version <= 30 && !ctx->Extensions.ARB_color_buffer_float) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glClampColor()"); + return; + } + if (clamp != GL_TRUE && clamp != GL_FALSE && clamp != GL_FIXED_ONLY_ARB) { _mesa_error(ctx, GL_INVALID_ENUM, "glClampColorARB(clamp)"); return; @@ -752,19 +1050,15 @@ _mesa_ClampColor(GLenum target, GLenum clamp) switch (target) { case GL_CLAMP_VERTEX_COLOR_ARB: - if (ctx->API == API_OPENGL_CORE && - !ctx->Extensions.ARB_color_buffer_float) { + if (ctx->API == API_OPENGL_CORE) goto invalid_enum; - } FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.ClampVertexColor = clamp; _mesa_update_clamp_vertex_color(ctx, ctx->DrawBuffer); break; case GL_CLAMP_FRAGMENT_COLOR_ARB: - if (ctx->API == API_OPENGL_CORE && - !ctx->Extensions.ARB_color_buffer_float) { + if (ctx->API == API_OPENGL_CORE) goto invalid_enum; - } FLUSH_VERTICES(ctx, _NEW_FRAG_CLAMP); ctx->Color.ClampFragmentColor = clamp; _mesa_update_clamp_fragment_color(ctx, ctx->DrawBuffer); @@ -829,7 +1123,7 @@ _mesa_update_clamp_fragment_color(struct gl_context *ctx, * - there is an integer colorbuffer */ if (!drawFb || !drawFb->_HasSNormOrFloatColorBuffer || - drawFb->_IntegerColor) + drawFb->_IntegerBuffers) ctx->Color._ClampFragmentColor = GL_FALSE; else ctx->Color._ClampFragmentColor = @@ -883,7 +1177,7 @@ void _mesa_init_color( struct gl_context * ctx ) /* Color buffer group */ ctx->Color.IndexMask = ~0u; - memset(ctx->Color.ColorMask, 0xff, sizeof(ctx->Color.ColorMask)); + ctx->Color.ColorMask = 0xffffffff; ctx->Color.ClearIndex = 0; ASSIGN_4V( ctx->Color.ClearColor.f, 0, 0, 0, 0 ); ctx->Color.AlphaEnabled = GL_FALSE; @@ -903,6 +1197,7 @@ void _mesa_init_color( struct gl_context * ctx ) ctx->Color.IndexLogicOpEnabled = GL_FALSE; ctx->Color.ColorLogicOpEnabled = GL_FALSE; ctx->Color.LogicOp = GL_COPY; + ctx->Color._LogicOp = COLOR_LOGICOP_COPY; ctx->Color.DitherFlag = GL_TRUE; /* GL_FRONT is not possible on GLES. Instead GL_BACK will render to either @@ -923,6 +1218,8 @@ void _mesa_init_color( struct gl_context * ctx ) * if EGL_KHR_gl_colorspace has been used to request sRGB. */ ctx->Color.sRGBEnabled = _mesa_is_gles(ctx); + + ctx->Color.BlendCoherent = true; } /*@}*/