diff --git a/blend.go b/blend.go index 3e90fd163..bffd72a88 100644 --- a/blend.go +++ b/blend.go @@ -67,7 +67,7 @@ const ( BlendFactorDestinationAlpha BlendFactorOneMinusSourceAlpha BlendFactorOneMinusDestinationAlpha - BlendFactorDestinationRGB + BlendFactorDestinationColor ) func (b BlendFactor) internalBlendFactor(source bool) graphicsdriver.BlendFactor { @@ -90,8 +90,8 @@ func (b BlendFactor) internalBlendFactor(source bool) graphicsdriver.BlendFactor return graphicsdriver.BlendFactorOneMinusSourceAlpha case BlendFactorOneMinusDestinationAlpha: return graphicsdriver.BlendFactorOneMinusDestinationAlpha - case BlendFactorDestinationRGB: - return graphicsdriver.BlendFactorDestinationRGB + case BlendFactorDestinationColor: + return graphicsdriver.BlendFactorDestinationColor default: panic(fmt.Sprintf("ebiten: invalid blend factor: %d", b)) } diff --git a/graphics.go b/graphics.go index c6ac57141..95dca10aa 100644 --- a/graphics.go +++ b/graphics.go @@ -80,7 +80,7 @@ const ( // Deprecated: as of v2.5. Use BlendLighter instead. CompositeModeLighter - // Deprecated: as of v2.5. Use Blend with BlendFactorDestinationRGB and BlendFactorZero instead. + // Deprecated: as of v2.5. Use Blend with BlendFactorDestinationColor and BlendFactorZero instead. CompositeModeMultiply ) @@ -114,8 +114,8 @@ func (c CompositeMode) blend() Blend { return BlendLighter case CompositeModeMultiply: return Blend{ - BlendFactorSourceRGB: BlendFactorDestinationRGB, - BlendFactorSourceAlpha: BlendFactorDestinationRGB, + BlendFactorSourceRGB: BlendFactorDestinationColor, + BlendFactorSourceAlpha: BlendFactorDestinationColor, BlendFactorDestinationRGB: BlendFactorZero, BlendFactorDestinationAlpha: BlendFactorZero, BlendOperationRGB: BlendOperationAdd, diff --git a/internal/graphicsdriver/blend.go b/internal/graphicsdriver/blend.go index d2007b2a7..023cdfb84 100644 --- a/internal/graphicsdriver/blend.go +++ b/internal/graphicsdriver/blend.go @@ -32,7 +32,7 @@ const ( BlendFactorDestinationAlpha BlendFactorOneMinusSourceAlpha BlendFactorOneMinusDestinationAlpha - BlendFactorDestinationRGB + BlendFactorDestinationColor ) type BlendOperation byte diff --git a/internal/graphicsdriver/directx/pipeline_windows.go b/internal/graphicsdriver/directx/pipeline_windows.go index 6c8fb9478..998e063b6 100644 --- a/internal/graphicsdriver/directx/pipeline_windows.go +++ b/internal/graphicsdriver/directx/pipeline_windows.go @@ -39,7 +39,7 @@ func blendFactorToBlend(f graphicsdriver.BlendFactor, alpha bool) _D3D12_BLEND { return _D3D12_BLEND_INV_SRC_ALPHA case graphicsdriver.BlendFactorOneMinusDestinationAlpha: return _D3D12_BLEND_INV_DEST_ALPHA - case graphicsdriver.BlendFactorDestinationRGB: + case graphicsdriver.BlendFactorDestinationColor: // D3D12_RENDER_TARGET_BLEND_DESC's *BlendAlpha members don't allow *_COLOR values. // See https://learn.microsoft.com/en-us/windows/win32/api/d3d12/ns-d3d12-d3d12_render_target_blend_desc. if alpha { diff --git a/internal/graphicsdriver/metal/graphics_darwin.go b/internal/graphicsdriver/metal/graphics_darwin.go index c77e3b10c..c73de0630 100644 --- a/internal/graphicsdriver/metal/graphics_darwin.go +++ b/internal/graphicsdriver/metal/graphics_darwin.go @@ -314,8 +314,8 @@ func blendFactorToMetalBlendFactor(c graphicsdriver.BlendFactor) mtl.BlendFactor return mtl.BlendFactorOneMinusSourceAlpha case graphicsdriver.BlendFactorOneMinusDestinationAlpha: return mtl.BlendFactorOneMinusDestinationAlpha - case graphicsdriver.BlendFactorDestinationRGB: - return mtl.BlendFactorDestinationRGB + case graphicsdriver.BlendFactorDestinationColor: + return mtl.BlendFactorDestinationColor default: panic(fmt.Sprintf("metal: invalid blend factor: %d", c)) } diff --git a/internal/graphicsdriver/metal/mtl/mtl_darwin.go b/internal/graphicsdriver/metal/mtl/mtl_darwin.go index dda7b41d3..872b9920f 100644 --- a/internal/graphicsdriver/metal/mtl/mtl_darwin.go +++ b/internal/graphicsdriver/metal/mtl/mtl_darwin.go @@ -275,7 +275,7 @@ const ( BlendFactorOneMinusSourceColor BlendFactor = 3 BlendFactorSourceAlpha BlendFactor = 4 BlendFactorOneMinusSourceAlpha BlendFactor = 5 - BlendFactorDestinationRGB BlendFactor = 6 + BlendFactorDestinationColor BlendFactor = 6 BlendFactorOneMinusDestinationColor BlendFactor = 7 BlendFactorDestinationAlpha BlendFactor = 8 BlendFactorOneMinusDestinationAlpha BlendFactor = 9 diff --git a/internal/graphicsdriver/opengl/context.go b/internal/graphicsdriver/opengl/context.go index 88894f414..bd50e4da0 100644 --- a/internal/graphicsdriver/opengl/context.go +++ b/internal/graphicsdriver/opengl/context.go @@ -55,7 +55,7 @@ func convertBlendFactor(f graphicsdriver.BlendFactor) blendFactor { return glOneMinusSrcAlpha case graphicsdriver.BlendFactorOneMinusDestinationAlpha: return glOneMinusDstAlpha - case graphicsdriver.BlendFactorDestinationRGB: + case graphicsdriver.BlendFactorDestinationColor: return glDstColor default: panic(fmt.Sprintf("opengl: invalid blend factor %d", f))