From 90dcf316313dfe0625c69867bcb036e7982b221d Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Tue, 10 Dec 2013 22:36:33 +0200 Subject: [PATCH] i965/blorp: unit test compiling msaa-4 ums to cms Signed-off-by: Topi Pohjolainen Reviewed-by: Matt Turner --- .../dri/i965/test_blorp_blit_eu_gen.cpp | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/mesa/drivers/dri/i965/test_blorp_blit_eu_gen.cpp b/src/mesa/drivers/dri/i965/test_blorp_blit_eu_gen.cpp index 5d49acef900..fa6b53de64c 100644 --- a/src/mesa/drivers/dri/i965/test_blorp_blit_eu_gen.cpp +++ b/src/mesa/drivers/dri/i965/test_blorp_blit_eu_gen.cpp @@ -436,6 +436,64 @@ test_gen7_msaa_8_cms_to_cms(struct brw_context *brw) return check(brw, &key, expected, sizeof(expected) - 1); } +/** + * * One of the flavours gotten when running piglit test: + * * "ext_framebuffer_multisample-blit-scaled 4" + * */ +static bool +test_gen7_msaa_4_ums_to_cms(struct brw_context *brw) +{ + static const char expected[] = + "0x00000000: add(16) g44<1>UW g1.4<2,4,0>UW 0x10101010V { align1 WE_normal 1H };\n" + "0x00000010: add(16) g46<1>UW g1.5<2,4,0>UW 0x11001100V { align1 WE_normal 1H };\n" + "0x00000020: mov(16) g48<1>UD g44<8,8,1>UW { align1 WE_normal 1H };\n" + "0x00000030: mov(16) g50<1>UD g46<8,8,1>UW { align1 WE_normal 1H };\n" + "0x00000040: mov(16) g54<1>UW 0x00003210V { align1 WE_normal 1H };\n" + "0x00000050: mov(8) g52<1>UD g54<1,4,0>UW { align1 WE_normal 1Q };\n" + "0x00000060: mov(8) g53<1>UD g54.2<1,4,0>UW { align1 WE_normal 1Q };\n" + "0x00000070: mov(16) g44<1>F g48<8,8,1>UD { align1 WE_normal 1H };\n" + "0x00000080: mov(16) g46<1>F g50<8,8,1>UD { align1 WE_normal 1H };\n" + "0x00000090: mul(16) g48<1>F g44<8,8,1>F g2.6<0,1,0>F { align1 WE_normal 1H };\n" + "0x000000a0: mul(16) g50<1>F g46<8,8,1>F g3<0,1,0>F { align1 WE_normal 1H };\n" + "0x000000b0: add(16) g48<1>F g48<8,8,1>F g2.7<0,1,0>F { align1 WE_normal 1H };\n" + "0x000000c0: add(16) g50<1>F g50<8,8,1>F g3.1<0,1,0>F { align1 WE_normal 1H };\n" + "0x000000d0: mov(16) g44<1>UD g48<8,8,1>F { align1 WE_normal 1H };\n" + "0x000000e0: mov(16) g46<1>UD g50<8,8,1>F { align1 WE_normal 1H };\n" + "0x000000f0: mov(16) g114<1>UD g52<8,8,1>UD { align1 WE_normal 1H };\n" + "0x00000100: mov(16) g116<1>UD g44<8,8,1>UD { align1 WE_normal 1H };\n" + "0x00000110: mov(16) g118<1>UD g46<8,8,1>UD { align1 WE_normal 1H };\n" + "0x00000120: send(16) g4<1>UW g114<8,8,1>F\n" + " sampler (0, 0, 31, 2) mlen 6 rlen 8 { align1 WE_normal 1H };\n" + "0x00000130: mov(16) g114<1>F g4<8,8,1>F { align1 WE_normal 1H };\n" + "0x00000140: mov(16) g116<1>F g6<8,8,1>F { align1 WE_normal 1H };\n" + "0x00000150: mov(16) g118<1>F g8<8,8,1>F { align1 WE_normal 1H };\n" + "0x00000160: mov(16) g120<1>F g10<8,8,1>F { align1 WE_normal 1H };\n" + "0x00000170: sendc(16) null g114<8,8,1>F\n" + " render ( RT write, 1, 0, 12) mlen 8 rlen 0 { align1 WE_normal 1H EOT };\n"; + struct brw_blorp_blit_prog_key key; + + key.tex_samples = 4; + key.tex_layout = INTEL_MSAA_LAYOUT_UMS; + key.src_samples = 4; + key.src_layout = INTEL_MSAA_LAYOUT_UMS; + key.rt_samples = 4; + key.rt_layout = INTEL_MSAA_LAYOUT_CMS; + key.dst_samples = 4; + key.dst_layout = INTEL_MSAA_LAYOUT_CMS; + key.texture_data_type = BRW_REGISTER_TYPE_F; + key.src_tiled_w = false; + key.dst_tiled_w = false; + key.blend = false; + key.use_kill = false; + key.persample_msaa_dispatch = true; + key.blit_scaled = false; + key.x_scale = 2.000000; + key.y_scale = 2.000000; + key.bilinear_filter = false; + + return check(brw, &key, expected, sizeof(expected) - 1); +} + int main(int argc, char **argv) { @@ -448,6 +506,7 @@ main(int argc, char **argv) pass = test_gen7_blend_scaled_msaa_8(&brw) && pass; pass = test_gen7_msaa_8_ums_to_cms(&brw) && pass; pass = test_gen7_msaa_8_cms_to_cms(&brw) && pass; + pass = test_gen7_msaa_4_ums_to_cms(&brw) && pass; /* Test suite expects zero for success */ return !pass; -- 2.30.2