metal: don't try to enable blending with integer canvases.

love2d · Aug 14, 2024 · 9d5828a · 9d5828a
1 parent 8e2fc44
commit 9d5828a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/graphics/metal/Graphics.mm b/src/modules/graphics/metal/Graphics.mm
@@ -1001,7 +1001,7 @@ static bool isClampOne(SamplerState::WrapMode w)
 			key.blend = state.blend;
 			key.colorChannelMask = state.colorMask;
 
-			pipeline = shader->getCachedRenderPipeline(key);
+			pipeline = shader->getCachedRenderPipeline(this, key);
 		}
 
 		[encoder setRenderPipelineState:pipeline];

diff --git a/src/modules/graphics/metal/Shader.h b/src/modules/graphics/metal/Shader.h
@@ -114,7 +114,7 @@ class Shader final : public love::graphics::Shader
 	ptrdiff_t getHandle() const override { return 0; }
 	void setVideoTextures(love::graphics::Texture *ytexture, love::graphics::Texture *cbtexture, love::graphics::Texture *crtexture) override;
 
-	id<MTLRenderPipelineState> getCachedRenderPipeline(const RenderPipelineKey &key);
+	id<MTLRenderPipelineState> getCachedRenderPipeline(Graphics *gfx, const RenderPipelineKey &key);
 	id<MTLComputePipelineState> getComputePipeline() const { return computePipeline; }
 
 	static int getUniformBufferBinding();

diff --git a/src/modules/graphics/metal/Shader.mm b/src/modules/graphics/metal/Shader.mm
@@ -855,7 +855,7 @@ static EShLanguage getGLSLangStage(ShaderStageType stage)
 	}
 }
 
-id<MTLRenderPipelineState> Shader::getCachedRenderPipeline(const RenderPipelineKey &key)
+id<MTLRenderPipelineState> Shader::getCachedRenderPipeline(graphics::Graphics *gfx, const RenderPipelineKey &key)
 {
 	auto it = cachedRenderPipelines.find(key);
 
@@ -882,7 +882,7 @@ static EShLanguage getGLSLangStage(ShaderStageType stage)
 		auto formatdesc = Metal::convertPixelFormat(device, format);
 		attachment.pixelFormat = formatdesc.format;
 
-		if (key.blend.enable)
+		if (key.blend.enable && gfx->isPixelFormatSupported(format, PIXELFORMATUSAGEFLAGS_BLEND))
 		{
 			attachment.blendingEnabled = YES;
 			attachment.sourceRGBBlendFactor = getMTLBlendFactor(key.blend.srcFactorRGB);