[PATCH 5/5] d3d10/tests: Regenerate state group test effect with newer compiler.
Nikolay Sivov
nsivov at codeweavers.com
Fri Sep 24 00:10:15 CDT 2021
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
Current compiler complains about deprecated naming for MipMapLODBias field,
which is possible to suppress with compat mode switch. However that will
generate value 0 for it.
dlls/d3d10/tests/effect.c | 186 +++++++++++++-------------------------
1 file changed, 62 insertions(+), 124 deletions(-)
diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c
index 9f377e80b17..e833fc09799 100644
--- a/dlls/d3d10/tests/effect.c
+++ b/dlls/d3d10/tests/effect.c
@@ -4069,7 +4069,7 @@ SamplerState sampler0
AddressU = wrap; /* 0x2e */
AddressV = mirror; /* 0x2f */
AddressW = clamp; /* 0x30 */
- MipMapLODBias = -1; /* 0x31 */
+ MipLODBias = -1; /* 0x31 */
MaxAnisotropy = 4u; /* 0x32 */
ComparisonFunc = always; /* 0x33 */
BorderColor = float4(1.0, 2.0, 3.0, 4.0); /* 0x34 */
@@ -4089,128 +4089,66 @@ technique10 tech0
#endif
static DWORD fx_test_state_groups[] =
{
- 0x43425844, 0xbf7e3418, 0xd2838ea5, 0x8012c315,
- 0x7dd76ca7, 0x00000001, 0x00000794, 0x00000001,
- 0x00000024, 0x30315846, 0x00000768, 0xfeff1001,
- 0x00000001, 0x00000000, 0x00000004, 0x00000000,
- 0x00000000, 0x00000000, 0x00000001, 0x0000035c,
- 0x00000000, 0x00000000, 0x00000001, 0x00000001,
- 0x00000001, 0x00000001, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724,
- 0x736c6162, 0x73615200, 0x69726574, 0x5372657a,
- 0x65746174, 0x00000d00, 0x00000200, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x00000400,
- 0x73617200, 0x74735f74, 0x00657461, 0x00000001,
- 0x00000002, 0x00000002, 0x00000001, 0x00000002,
- 0x00000002, 0x00000001, 0x00000004, 0x00000001,
- 0x00000001, 0x00000002, 0xfffffffc, 0x00000001,
- 0x00000001, 0x3f000000, 0x00000001, 0x00000001,
- 0x3e800000, 0x00000001, 0x00000004, 0x00000000,
- 0x00000001, 0x00000004, 0x00000001, 0x00000001,
- 0x00000004, 0x00000001, 0x00000001, 0x00000004,
- 0x00000001, 0x74706544, 0x65745368, 0x6c69636e,
- 0x74617453, 0x00bc0065, 0x00020000, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x00030000,
- 0x73640000, 0x6174735f, 0x01006574, 0x04000000,
- 0x01000000, 0x01000000, 0x02000000, 0x00000000,
- 0x01000000, 0x02000000, 0x03000000, 0x01000000,
- 0x04000000, 0x01000000, 0x01000000, 0x02000000,
- 0x04000000, 0x01000000, 0x02000000, 0x05000000,
- 0x01000000, 0x02000000, 0x06000000, 0x01000000,
- 0x02000000, 0x07000000, 0x01000000, 0x02000000,
- 0x08000000, 0x01000000, 0x02000000, 0x04000000,
- 0x01000000, 0x02000000, 0x03000000, 0x01000000,
- 0x02000000, 0x04000000, 0x01000000, 0x02000000,
- 0x05000000, 0x01000000, 0x02000000, 0x07000000,
- 0x42000000, 0x646e656c, 0x74617453, 0x019b0065,
- 0x00020000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00020000, 0x6c620000, 0x5f646e65,
- 0x74617473, 0x00010065, 0x00040000, 0x00000000,
- 0x00010000, 0x00040000, 0x00010000, 0x00010000,
- 0x00040000, 0x00000000, 0x00010000, 0x00020000,
- 0x00020000, 0x00010000, 0x00020000, 0x00030000,
- 0x00010000, 0x00020000, 0x00040000, 0x00010000,
- 0x00020000, 0x00050000, 0x00010000, 0x00020000,
- 0x00060000, 0x00010000, 0x00020000, 0x00050000,
- 0x00010000, 0x00020000, 0x00080000, 0x00010000,
- 0x00020000, 0x00070000, 0x61530000, 0x656c706d,
- 0x61745372, 0x52006574, 0x02000002, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x15000000,
- 0x73000000, 0x6c706d61, 0x00307265, 0x00000001,
- 0x00000002, 0x00000015, 0x00000001, 0x00000002,
- 0x00000001, 0x00000001, 0x00000002, 0x00000002,
- 0x00000001, 0x00000002, 0x00000003, 0x00000001,
- 0x00000002, 0xffffffff, 0x00000001, 0x00000002,
- 0x00000004, 0x00000001, 0x00000002, 0x00000008,
- 0x00000004, 0x00000001, 0x3f800000, 0x00000001,
- 0x40000000, 0x00000001, 0x40400000, 0x00000001,
- 0x40800000, 0x00000001, 0x00000002, 0x00000006,
- 0x00000001, 0x00000002, 0x00000005, 0x68636574,
- 0x61700030, 0x00307373, 0x00000004, 0x00000001,
- 0x3f000000, 0x00000001, 0x3f19999a, 0x00000001,
- 0x3f333333, 0x00000001, 0x3f4ccccd, 0x00000001,
- 0x00000002, 0x0000ffff, 0x00000001, 0x00000001,
- 0x3f800000, 0x00000004, 0x00000000, 0x00000000,
- 0x00000000, 0xffffffff, 0x00000000, 0x00000039,
- 0x0000001d, 0x00000000, 0xffffffff, 0x0000000a,
- 0x0000000c, 0x00000000, 0x00000001, 0x00000044,
- 0x0000000d, 0x00000000, 0x00000001, 0x00000050,
- 0x0000000e, 0x00000000, 0x00000001, 0x0000005c,
- 0x0000000f, 0x00000000, 0x00000001, 0x00000068,
- 0x00000010, 0x00000000, 0x00000001, 0x00000074,
- 0x00000011, 0x00000000, 0x00000001, 0x00000080,
- 0x00000012, 0x00000000, 0x00000001, 0x0000008c,
- 0x00000013, 0x00000000, 0x00000001, 0x00000098,
- 0x00000014, 0x00000000, 0x00000001, 0x000000a4,
- 0x00000015, 0x00000000, 0x00000001, 0x000000b0,
- 0x00000000, 0x000000ea, 0x000000ce, 0x00000000,
- 0xffffffff, 0x0000000e, 0x00000016, 0x00000000,
- 0x00000001, 0x000000f3, 0x00000017, 0x00000000,
- 0x00000001, 0x000000ff, 0x00000018, 0x00000000,
- 0x00000001, 0x0000010b, 0x00000019, 0x00000000,
- 0x00000001, 0x00000117, 0x0000001a, 0x00000000,
- 0x00000001, 0x00000123, 0x0000001b, 0x00000000,
- 0x00000001, 0x0000012f, 0x0000001c, 0x00000000,
- 0x00000001, 0x0000013b, 0x0000001d, 0x00000000,
- 0x00000001, 0x00000147, 0x0000001e, 0x00000000,
- 0x00000001, 0x00000153, 0x0000001f, 0x00000000,
- 0x00000001, 0x0000015f, 0x00000020, 0x00000000,
- 0x00000001, 0x0000016b, 0x00000021, 0x00000000,
- 0x00000001, 0x00000177, 0x00000022, 0x00000000,
- 0x00000001, 0x00000183, 0x00000023, 0x00000000,
- 0x00000001, 0x0000018f, 0x00000000, 0x000001c2,
- 0x000001a6, 0x00000000, 0xffffffff, 0x0000000b,
- 0x00000024, 0x00000000, 0x00000001, 0x000001ce,
- 0x00000025, 0x00000000, 0x00000001, 0x000001da,
- 0x00000025, 0x00000007, 0x00000001, 0x000001e6,
- 0x00000026, 0x00000000, 0x00000001, 0x000001f2,
- 0x00000027, 0x00000000, 0x00000001, 0x000001fe,
- 0x00000028, 0x00000000, 0x00000001, 0x0000020a,
- 0x00000029, 0x00000000, 0x00000001, 0x00000216,
- 0x0000002a, 0x00000000, 0x00000001, 0x00000222,
- 0x0000002b, 0x00000000, 0x00000001, 0x0000022e,
- 0x0000002c, 0x00000000, 0x00000001, 0x0000023a,
- 0x0000002c, 0x00000007, 0x00000001, 0x00000246,
- 0x00000000, 0x0000027b, 0x0000025f, 0x00000000,
- 0xffffffff, 0x0000000a, 0x0000002d, 0x00000000,
- 0x00000001, 0x00000284, 0x0000002e, 0x00000000,
- 0x00000001, 0x00000290, 0x0000002f, 0x00000000,
- 0x00000001, 0x0000029c, 0x00000030, 0x00000000,
- 0x00000001, 0x000002a8, 0x00000031, 0x00000000,
- 0x00000001, 0x000002b4, 0x00000032, 0x00000000,
- 0x00000001, 0x000002c0, 0x00000033, 0x00000000,
- 0x00000001, 0x000002cc, 0x00000034, 0x00000000,
- 0x00000001, 0x000002d8, 0x00000035, 0x00000000,
- 0x00000001, 0x000002fc, 0x00000036, 0x00000000,
- 0x00000001, 0x00000308, 0x00000000, 0x00000314,
- 0x00000001, 0x00000000, 0x0000031a, 0x00000006,
- 0x00000000, 0x0000000a, 0x00000000, 0x00000001,
- 0x00000320, 0x0000000b, 0x00000000, 0x00000001,
- 0x00000344, 0x00000002, 0x00000000, 0x00000002,
- 0x000001c2, 0x00000009, 0x00000000, 0x00000001,
- 0x00000350, 0x00000001, 0x00000000, 0x00000002,
- 0x000000ea, 0x00000000, 0x00000000, 0x00000002,
- 0x00000039,
+ 0x43425844, 0xacdae4ef, 0x5046a276, 0xda953136, 0x0b78e818, 0x00000001, 0x00000773, 0x00000001,
+ 0x00000024, 0x30315846, 0x00000747, 0xfeff1001, 0x00000000, 0x00000000, 0x00000004, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000001, 0x00000353, 0x00000000, 0x00000000, 0x00000001, 0x00000001,
+ 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x74736152,
+ 0x7a697265, 0x74537265, 0x00657461, 0x00000004, 0x00000002, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000004, 0x74736172, 0x6174735f, 0x01006574, 0x02000000, 0x02000000, 0x01000000,
+ 0x02000000, 0x02000000, 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x02000000, 0xfc000000,
+ 0x01ffffff, 0x01000000, 0x00000000, 0x013f0000, 0x01000000, 0x00000000, 0x013e8000, 0x04000000,
+ 0x00000000, 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x04000000, 0x01000000, 0x01000000,
+ 0x04000000, 0x01000000, 0x44000000, 0x68747065, 0x6e657453, 0x536c6963, 0x65746174, 0x0000b300,
+ 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, 0x5f736400, 0x74617473,
+ 0x00010065, 0x00040000, 0x00010000, 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000,
+ 0x00030000, 0x00010000, 0x00040000, 0x00010000, 0x00010000, 0x00030000, 0x00040000, 0x00010000,
+ 0x00030000, 0x00050000, 0x00010000, 0x00020000, 0x00060000, 0x00010000, 0x00020000, 0x00070000,
+ 0x00010000, 0x00020000, 0x00080000, 0x00010000, 0x00020000, 0x00040000, 0x00010000, 0x00020000,
+ 0x00030000, 0x00010000, 0x00020000, 0x00040000, 0x00010000, 0x00020000, 0x00050000, 0x00010000,
+ 0x00020000, 0x00070000, 0x6c420000, 0x53646e65, 0x65746174, 0x00019200, 0x00000200, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x656c6200, 0x735f646e, 0x65746174, 0x00000100,
+ 0x00000400, 0x00000000, 0x00000100, 0x00000400, 0x00000100, 0x00000100, 0x00000400, 0x00000000,
+ 0x00000100, 0x00000200, 0x00000200, 0x00000100, 0x00000200, 0x00000300, 0x00000100, 0x00000200,
+ 0x00000400, 0x00000100, 0x00000200, 0x00000500, 0x00000100, 0x00000200, 0x00000600, 0x00000100,
+ 0x00000200, 0x00000500, 0x00000100, 0x00000300, 0x00000800, 0x00000100, 0x00000300, 0x00000700,
+ 0x6d615300, 0x72656c70, 0x74617453, 0x02490065, 0x00020000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00150000, 0x61730000, 0x656c706d, 0x01003072, 0x02000000, 0x15000000, 0x01000000,
+ 0x02000000, 0x01000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x03000000,
+ 0x01000000, 0x02000000, 0xff000000, 0x01ffffff, 0x03000000, 0x04000000, 0x01000000, 0x02000000,
+ 0x08000000, 0x04000000, 0x01000000, 0x00000000, 0x013f8000, 0x00000000, 0x01400000, 0x00000000,
+ 0x01404000, 0x00000000, 0x01408000, 0x03000000, 0x06000000, 0x01000000, 0x03000000, 0x05000000,
+ 0x74000000, 0x30686365, 0x73617000, 0x04003073, 0x01000000, 0x00000000, 0x013f0000, 0x9a000000,
+ 0x013f1999, 0x33000000, 0x013f3333, 0xcd000000, 0x013f4ccc, 0x03000000, 0xff000000, 0x010000ff,
+ 0x01000000, 0x00000000, 0x303f8000, 0x14000000, 0x00000000, 0xff000000, 0x0affffff, 0x0c000000,
+ 0x00000000, 0x01000000, 0x3b000000, 0x0d000000, 0x00000000, 0x01000000, 0x47000000, 0x0e000000,
+ 0x00000000, 0x01000000, 0x53000000, 0x0f000000, 0x00000000, 0x01000000, 0x5f000000, 0x10000000,
+ 0x00000000, 0x01000000, 0x6b000000, 0x11000000, 0x00000000, 0x01000000, 0x77000000, 0x12000000,
+ 0x00000000, 0x01000000, 0x83000000, 0x13000000, 0x00000000, 0x01000000, 0x8f000000, 0x14000000,
+ 0x00000000, 0x01000000, 0x9b000000, 0x15000000, 0x00000000, 0x01000000, 0xa7000000, 0x00000000,
+ 0xe1000000, 0xc5000000, 0x00000000, 0xff000000, 0x0effffff, 0x16000000, 0x00000000, 0x01000000,
+ 0xea000000, 0x17000000, 0x00000000, 0x01000000, 0xf6000000, 0x18000000, 0x00000000, 0x01000000,
+ 0x02000000, 0x19000001, 0x00000000, 0x01000000, 0x0e000000, 0x1a000001, 0x00000000, 0x01000000,
+ 0x1a000000, 0x1b000001, 0x00000000, 0x01000000, 0x26000000, 0x1c000001, 0x00000000, 0x01000000,
+ 0x32000000, 0x1d000001, 0x00000000, 0x01000000, 0x3e000000, 0x1e000001, 0x00000000, 0x01000000,
+ 0x4a000000, 0x1f000001, 0x00000000, 0x01000000, 0x56000000, 0x20000001, 0x00000000, 0x01000000,
+ 0x62000000, 0x21000001, 0x00000000, 0x01000000, 0x6e000000, 0x22000001, 0x00000000, 0x01000000,
+ 0x7a000000, 0x23000001, 0x00000000, 0x01000000, 0x86000000, 0x00000001, 0xb9000000, 0x9d000001,
+ 0x00000001, 0xff000000, 0x0bffffff, 0x24000000, 0x00000000, 0x01000000, 0xc5000000, 0x25000001,
+ 0x00000000, 0x01000000, 0xd1000000, 0x25000001, 0x07000000, 0x01000000, 0xdd000000, 0x26000001,
+ 0x00000000, 0x01000000, 0xe9000000, 0x27000001, 0x00000000, 0x01000000, 0xf5000000, 0x28000001,
+ 0x00000000, 0x01000000, 0x01000000, 0x29000002, 0x00000000, 0x01000000, 0x0d000000, 0x2a000002,
+ 0x00000000, 0x01000000, 0x19000000, 0x2b000002, 0x00000000, 0x01000000, 0x25000000, 0x2c000002,
+ 0x00000000, 0x01000000, 0x31000000, 0x2c000002, 0x07000000, 0x01000000, 0x3d000000, 0x00000002,
+ 0x72000000, 0x56000002, 0x00000002, 0xff000000, 0x0affffff, 0x2d000000, 0x00000000, 0x01000000,
+ 0x7b000000, 0x2e000002, 0x00000000, 0x01000000, 0x87000000, 0x2f000002, 0x00000000, 0x01000000,
+ 0x93000000, 0x30000002, 0x00000000, 0x01000000, 0x9f000000, 0x31000002, 0x00000000, 0x01000000,
+ 0xab000000, 0x32000002, 0x00000000, 0x01000000, 0xb7000000, 0x33000002, 0x00000000, 0x01000000,
+ 0xc3000000, 0x34000002, 0x00000000, 0x01000000, 0xcf000000, 0x35000002, 0x00000000, 0x01000000,
+ 0xf3000000, 0x36000002, 0x00000000, 0x01000000, 0xff000000, 0x00000002, 0x0b000000, 0x01000003,
+ 0x00000000, 0x11000000, 0x06000003, 0x00000000, 0x0a000000, 0x00000000, 0x01000000, 0x17000000,
+ 0x0b000003, 0x00000000, 0x01000000, 0x3b000000, 0x02000003, 0x00000000, 0x02000000, 0xb9000000,
+ 0x09000001, 0x00000000, 0x01000000, 0x47000000, 0x01000003, 0x00000000, 0x02000000, 0xe1000000,
+ 0x00000000, 0x00000000, 0x02000000, 0x30000000, 0x00000000,
};
static void test_effect_state_groups(void)
@@ -4250,7 +4188,7 @@ static void test_effect_state_groups(void)
hr = effect->lpVtbl->GetDesc(effect, &effect_desc);
ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr);
ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n");
- ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n",
+ ok(!effect_desc.ConstantBuffers, "Unexpected constant buffers count %u.\n",
effect_desc.ConstantBuffers);
ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n",
effect_desc.SharedConstantBuffers);
--
2.33.0
More information about the wine-devel
mailing list