diff --git a/README.md b/README.md index 2bf25af7..46650e45 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ strip ArmorPaint **macOS** ```bash -git apply armorcore/patch/metal_depth.diff --directory=armorcore/Kinc armorcore/Kinc/make --from armorcore -g metal cp -a build/krom/ armorcore/Deployment # Open generated Xcode project at `build/ArmorPaint.xcodeproj` @@ -55,7 +54,6 @@ cp -r build/krom/* build/ArmorPaint/app/src/main/assets/ ```bash git clone https://github.com/armory3d/armorpaint_plugins Libraries/plugins git apply armorcore/patch/ios_document_picker.diff --directory=armorcore/Kinc -git apply armorcore/patch/metal_depth.diff --directory=armorcore/Kinc armorcore/Kinc/make --from armorcore -g metal ios cp -a build/krom/ armorcore/Deployment # Open generated Xcode project `build/ArmorPaint.xcodeproj` diff --git a/Sources/arm/render/RenderPathDeferred.hx b/Sources/arm/render/RenderPathDeferred.hx index a015ca19..6246bb22 100644 --- a/Sources/arm/render/RenderPathDeferred.hx +++ b/Sources/arm/render/RenderPathDeferred.hx @@ -23,21 +23,6 @@ class RenderPathDeferred { path = _path; - #if kha_metal - { - path.loadShader("clear_pass/clear_pass/clear_pass_color_depth_r8"); - path.loadShader("clear_pass/clear_pass/clear_pass_color_depth_rgba32"); - path.loadShader("clear_pass/clear_pass/clear_pass_color_depth_rgba64"); - path.loadShader("clear_pass/clear_pass/clear_pass_color_r8"); - path.loadShader("clear_pass/clear_pass/clear_pass_color_rgba32"); - path.loadShader("clear_pass/clear_pass/clear_pass_color_rgba64"); - path.loadShader("clear_pass/clear_pass/clear_pass_depth_r8"); - path.loadShader("clear_pass/clear_pass/clear_pass_depth_rgba32"); - path.loadShader("clear_pass/clear_pass/clear_pass_depth_rgba64"); - path.clearShader = "clear_pass/clear_pass/clear_pass"; - } - #end - path.createDepthBuffer("main", "DEPTH24"); { diff --git a/khafile.js b/khafile.js index de2a7e71..c8eaf63b 100644 --- a/khafile.js +++ b/khafile.js @@ -40,10 +40,6 @@ else { project.addAssets("Assets/meshes/*", { destination: "data/meshes/{name}" }); project.addAssets("Libraries/armorbase/Assets/licenses/**", { destination: "data/licenses/{name}" }); project.addAssets("Libraries/armorbase/Assets/themes/*.json", { destination: "data/themes/{name}" }); -if (metal) { - project.addShaders("Libraries/armorbase/Shaders/common/metal/*.glsl", { embed: snapshot}); - project.addAssets("Libraries/armorbase/Assets/common/metal/*", { destination: "data/{name}" }); -} project.addDefine("js-es=6"); project.addParameter("--macro include('arm.node.brush')"); project.addDefine("kha_no_ogg");