From ef4b15f7a520b3da67b94b095c51377cee80fc35 Mon Sep 17 00:00:00 2001 From: Unknown <0.tamas.marton@gmail.com> Date: Sun, 8 Dec 2019 22:09:53 +0000 Subject: [PATCH] modified tests to reflect no shader patching --- test/blending/blending.cpp | 43 -------------------------------- test/depthTest/depthTest.cpp | 5 +++- test/stencilTest/stencilTest.cpp | 6 +++++ 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/test/blending/blending.cpp b/test/blending/blending.cpp index a600399..b4f088c 100644 --- a/test/blending/blending.cpp +++ b/test/blending/blending.cpp @@ -964,49 +964,6 @@ void CreateShaders() "\0"; /**/ - /** - blending depends on MSAA state - eg. if MSAA is enabled we need to do blending per sample! - Rr = Rs * sr OP Rd * dr - Gr = Gs * sg OP Gd * dg - Br = Bs * sb OP Bd * db - Ar = As * sa OP Ad * da - - multiplication of factors: v8muld - - OP can be: - add: v8adds - sub: v8subs - reverse sub: v8subs - - factors sx and dx can be: - zero: small immediate - one: small immediate - src color: - 1 - src color: not - dst color: - 1 - dst color: not - src alpha: - 1 - src alpha: not - dst alpha: - 1 - dst alpha: not - constant color: load immediate - 1 - constant color: - constant alpha: - 1 - constant alpha: - - 24 - 16 - 16777215: 00ff ffff - -16777216: ff00 0000 - src alpha saturate: - i = min(As, 1 - Ad) - res = (i, i, i, 1) - 1-Ad not(Ad) - minres = v8min As, 1-Ad - (minres & (00ff ffff)) | (ff00 0000) - /**/ - /**/ //display a color char fs_asm_code[] = diff --git a/test/depthTest/depthTest.cpp b/test/depthTest/depthTest.cpp index 0738d2f..60d567b 100644 --- a/test/depthTest/depthTest.cpp +++ b/test/depthTest/depthTest.cpp @@ -909,7 +909,7 @@ void CreateRenderPass() attachDesc[1].format = depthFormat; attachDesc[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachDesc[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - attachDesc[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachDesc[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachDesc[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; attachDesc[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; attachDesc[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; @@ -1103,6 +1103,9 @@ void CreateShaders() /**/ //display a color char fs_asm_code[] = + "sig_none ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" + "sig_none ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" + "sig_none ; tlb_z = or.always(b, b, nop, rb15) ; nop = nop(r0, r0) ;" "sig_none ; tlb_color_all = or.always(a, a, uni, nop) ; nop = nop(r0, r0) ;" "sig_end ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" "sig_none ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" diff --git a/test/stencilTest/stencilTest.cpp b/test/stencilTest/stencilTest.cpp index c75d98d..e10031e 100644 --- a/test/stencilTest/stencilTest.cpp +++ b/test/stencilTest/stencilTest.cpp @@ -1105,6 +1105,9 @@ void CreateShaders() //display a color char fs_asm_code[] = ///omit color write + "sig_load_imm ; r0 = load32.always(0xF497EEFF‬) ; nop = load32() ;" + "sig_none ; tlb_stencil_setup = or.always(r0, r0) ; nop = nop(r0, r0) ;" + "sig_none ; tlb_z = or.always(b, b, nop, rb15) ; nop = nop(r0, r0) ;" "sig_none ; r0 = or.always(a, a, uni, nop) ; nop = nop(r0, r0) ;" "sig_end ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" "sig_none ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" @@ -1115,6 +1118,9 @@ void CreateShaders() /**/ //display a color char fs_asm_code2[] = + "sig_load_imm ; r0 = load32.always(0xF24DEEFF) ; nop = load32() ;" + "sig_none ; tlb_stencil_setup = or.always(r0, r0) ; nop = nop(r0, r0) ;" + "sig_none ; tlb_z = or.always(b, b, nop, rb15) ; nop = nop(r0, r0) ;" "sig_none ; tlb_color_all = or.always(a, a, uni, nop) ; nop = nop(r0, r0) ;" "sig_end ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;" "sig_none ; nop = nop(r0, r0) ; nop = nop(r0, r0) ;"