edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make metal work

Browse Source
This commit is contained in:
Lubos Lenco
2020-05-11 22:50:32 +02:00
parent 2e5ca0fe9f
commit 6f24aafccc
21 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/render/RenderPathDeferred.hx
+16
View File
@@ -22,6 +22,16 @@ class RenderPathDeferred {
public static function init(_path: RenderPath) {
path = _path;
#if kha_metal
{
path.loadShader("clear_color_depth_pass/clear_color_depth_pass/clear_color_depth8_pass");
path.loadShader("clear_color_depth_pass/clear_color_depth_pass/clear_color_depth32_pass");
path.loadShader("clear_color_depth_pass/clear_color_depth_pass/clear_color_depth64_pass");
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth32_pass";
}
#end
path.createDepthBuffer("main", "DEPTH24");
{
@@ -530,6 +540,9 @@ class RenderPathDeferred {
var current = taaFrame % 2 == 0 ? "bufa" : "taa2";
var last = taaFrame % 2 == 0 ? "taa2" : "bufa";
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth32_pass";
#end
path.setTarget(current);
path.clearTarget(0x00000000);
path.bindTarget("buf", "colorTex");
@@ -579,6 +592,9 @@ class RenderPathDeferred {
}
public static function drawGbuffer() {
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth64_pass";
#end
path.setTarget("gbuffer0"); // Only clear gbuffer0
path.clearTarget(null, 1.0);
path.setTarget("gbuffer2");
Sources/arm/render/RenderPathForward.hx
+7
View File
@@ -60,6 +60,9 @@ class RenderPathForward {
}
static function drawGbuffer() {
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth64_pass";
#end
path.setTarget("gbuffer0");
path.clearTarget(null, 1.0);
path.setTarget("gbuffer2");
@@ -95,6 +98,10 @@ class RenderPathForward {
var current = taaFrame % 2 == 0 ? "bufa" : "taa2";
var last = taaFrame % 2 == 0 ? "taa2" : "bufa";
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth32_pass";
#end
path.setTarget(current);
path.clearTarget(0x00000000);
path.bindTarget("buf", "colorTex");
Sources/arm/render/RenderPathPaint.hx
+8
View File
@@ -623,8 +623,16 @@ class RenderPathPaint {
if (Context.brushBlendDirty) {
Context.brushBlendDirty = false;
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth8_pass";
path.setTarget("texpaint_blend0");
path.clearTarget(0x00000000);
path.setTarget("texpaint_blend1");
path.clearTarget(0x00000000);
#else
path.setTarget("texpaint_blend0", ["texpaint_blend1"]);
path.clearTarget(0x00000000);
#end
}
if (Context.paint2d) {
Sources/arm/render/RenderPathPreview.hx
+10 -3
View File
@@ -83,14 +83,21 @@ class RenderPathPreview {
}
public static function commandsPreview() {
#if kha_metal
path.clearShader = "clear_color_depth_pass/clear_color_depth_pass/clear_color_depth64_pass";
#end
path.setTarget("mgbuffer2");
path.clearTarget(0xff000000);
path.setTarget("mgbuffer0", ["mgbuffer1", "mgbuffer2"]);
#if arm_world
path.clearTarget(0xffffffff, 1.0);
var clearColor = 0xffffffff;
#else
path.clearTarget(null, 1.0);
var clearColor: Null<Int> = null;
#end
path.setTarget("mgbuffer0");
path.clearTarget(clearColor, 1.0);
path.setTarget("mgbuffer0", ["mgbuffer1", "mgbuffer2"]);
path.drawMeshes("mesh");
// ---