From 0f0b367468be61b9b1630ee1de32d853b87b2390 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Mon, 21 Jul 2025 22:42:32 +0200
Subject: [PATCH] Fix 16/32bit layer paint

---
 armorpaint/sources/render_path_paint.ts |  27 ++++++++++++++++++------
 base/assets/shader_datas.arm            | Bin 15215 -> 17997 bytes
 base/sources/ts/render_path_deferred.ts |   2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/armorpaint/sources/render_path_paint.ts b/armorpaint/sources/render_path_paint.ts
index aa7022bd..f9340434 100644
--- a/armorpaint/sources/render_path_paint.ts
+++ b/armorpaint/sources/render_path_paint.ts
@@ -98,6 +98,8 @@ function render_path_paint_init() {
 	render_path_load_shader("shader_datas/copy_mrt3_pass/copy_mrt3RGBA64_pass");
 	render_path_load_shader("shader_datas/copy_mrt3_pass/copy_mrt3RGBA128_pass");
 	render_path_load_shader("shader_datas/dilate_pass/dilate_pass");
+	render_path_load_shader("shader_datas/dilate_pass/dilateRGBA64_pass");
+	render_path_load_shader("shader_datas/dilate_pass/dilateRGBA128_pass");
 }
 
 function render_path_paint_draw_fullscreen_triangle(context: string) {
@@ -850,29 +852,42 @@ function render_path_paint_dilate(base: bool, nor_pack: bool) {
 		util_uv_cache_dilate_map();
 		layers_make_temp_img();
 		let tid: i32 = context_raw.layer.id;
+
+		let format: string = base_bits_handle.position == texture_bits_t.BITS8  ? "RGBA32" :
+							 base_bits_handle.position == texture_bits_t.BITS16 ? "RGBA64" :
+																				  "RGBA128";
+
+		let copy_pass: string = format == "RGBA64"  ? "copyRGBA64_pass"  :
+								format == "RGBA128" ? "copyRGBA128_pass" :
+													  "copy_pass";
+
+		let dilate_pass: string = format == "RGBA64"  ? "dilateRGBA64_pass"  :
+								  format == "RGBA128" ? "dilateRGBA128_pass" :
+														"dilate_pass";
+
 		if (base) {
 			let texpaint: string = "texpaint";
 			render_path_set_target("temptex0");
 			render_path_bind_target(texpaint + tid, "tex");
-			render_path_draw_shader("shader_datas/copy_pass/copy_pass");
+			render_path_draw_shader("shader_datas/copy_pass/" + copy_pass);
 			render_path_set_target(texpaint + tid);
 			render_path_bind_target("temptex0", "tex");
-			render_path_draw_shader("shader_datas/dilate_pass/dilate_pass");
+			render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass);
 		}
 		if (nor_pack && !slot_layer_is_mask(context_raw.layer)) {
 			render_path_set_target("temptex0");
 			render_path_bind_target("texpaint_nor" + tid, "tex");
-			render_path_draw_shader("shader_datas/copy_pass/copy_pass");
+			render_path_draw_shader("shader_datas/copy_pass/" + copy_pass);
 			render_path_set_target("texpaint_nor" + tid);
 			render_path_bind_target("temptex0", "tex");
-			render_path_draw_shader("shader_datas/dilate_pass/dilate_pass");
+			render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass);
 
 			render_path_set_target("temptex0");
 			render_path_bind_target("texpaint_pack" + tid, "tex");
-			render_path_draw_shader("shader_datas/copy_pass/copy_pass");
+			render_path_draw_shader("shader_datas/copy_pass/" + copy_pass);
 			render_path_set_target("texpaint_pack" + tid);
 			render_path_bind_target("temptex0", "tex");
-			render_path_draw_shader("shader_datas/dilate_pass/dilate_pass");
+			render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass);
 		}
 	}
 }
diff --git a/base/assets/shader_datas.arm b/base/assets/shader_datas.arm
index 0edf6d3b4251f7ae859d06f209ad68430fe80bfc..24dec25f58c19b1ed4aa0b3f9f2507bc25a47a9d 100644
GIT binary patch
delta 224
zcmaD~cD9Fc!zMOHmdSjAVv}dHaZUct9JX1LotI_u2M#_Ceg+1H<otrl$+9X*Kv5;e
z$qKxDlPBmc1Ih9WKxKp6og58~EGB<sj)5s+o7|w$HF>{)@#GqAiOn(Gj&hTI6@@o%
z(EP(BAp+EPn*~VZCFZ8y76dX<GIJ73Qo)vpX{o_1$(nqcNqF)O?Jx4EI)valkS&I4
P1X)}R(ztnt_I7>%qS8aX

delta 53
zcmV-50LuT(i~;X<u(Ae|5FZnhmj({Arww=kvr7o;0+X);4wD)X7_<5hK^~K<6%(^g
LF8l(siZ{a!ESeN4

diff --git a/base/sources/ts/render_path_deferred.ts b/base/sources/ts/render_path_deferred.ts
index 67208d39..302213ff 100644
--- a/base/sources/ts/render_path_deferred.ts
+++ b/base/sources/ts/render_path_deferred.ts
@@ -111,6 +111,8 @@ function render_path_deferred_init() {
 	render_path_load_shader("shader_datas/compositor_pass/compositor_pass");
 	render_path_load_shader("shader_datas/copy_pass/copy_pass");
 	render_path_load_shader("shader_datas/copy_pass/copyR8_pass");
+	render_path_load_shader("shader_datas/copy_pass/copyRGBA64_pass");
+	render_path_load_shader("shader_datas/copy_pass/copyRGBA128_pass");
 	render_path_load_shader("shader_datas/taa_pass/taa_pass");
 	render_path_load_shader("shader_datas/supersample_resolve/supersample_resolve");
 	render_path_load_shader("shader_datas/supersample_resolve/supersample_resolveRGBA64");