|
1 | 1 | /* |
2 | | - * Copyright 2019-2024 Diligent Graphics LLC |
| 2 | + * Copyright 2019-2026 Diligent Graphics LLC |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
@@ -37,27 +37,27 @@ TEST(Tools_RenderStateNotationParser, ParseGraphicsTypesEnums) |
37 | 37 | { |
38 | 38 | DynamicLinearAllocator Allocator{DefaultRawMemoryAllocator::GetAllocator()}; |
39 | 39 |
|
40 | | - ASSERT_TRUE(TestEnum<VALUE_TYPE>(Allocator, VT_UNDEFINED, VT_NUM_TYPES)); |
| 40 | + EXPECT_TRUE(TestEnum<VALUE_TYPE>(Allocator, VT_UNDEFINED, VT_NUM_TYPES)); |
41 | 41 |
|
42 | | - ASSERT_TRUE(TestEnum<TEXTURE_FORMAT>(Allocator, TEX_FORMAT_UNKNOWN, TEX_FORMAT_NUM_FORMATS)); |
| 42 | + EXPECT_TRUE(TestEnum<TEXTURE_FORMAT>(Allocator, TEX_FORMAT_UNKNOWN, TEX_FORMAT_NUM_FORMATS)); |
43 | 43 |
|
44 | | - ASSERT_TRUE(TestEnum<FILTER_TYPE>(Allocator, FILTER_TYPE_UNKNOWN, FILTER_TYPE_NUM_FILTERS)); |
| 44 | + EXPECT_TRUE(TestEnum<FILTER_TYPE>(Allocator, FILTER_TYPE_UNKNOWN, FILTER_TYPE_NUM_FILTERS)); |
45 | 45 |
|
46 | | - ASSERT_TRUE(TestEnum<TEXTURE_ADDRESS_MODE>(Allocator, TEXTURE_ADDRESS_UNKNOWN, TEXTURE_ADDRESS_NUM_MODES)); |
| 46 | + EXPECT_TRUE(TestEnum<TEXTURE_ADDRESS_MODE>(Allocator, TEXTURE_ADDRESS_UNKNOWN, TEXTURE_ADDRESS_NUM_MODES)); |
47 | 47 |
|
48 | | - ASSERT_TRUE(TestEnum<COMPARISON_FUNCTION>(Allocator, COMPARISON_FUNC_UNKNOWN, COMPARISON_FUNC_NUM_FUNCTIONS)); |
| 48 | + EXPECT_TRUE(TestEnum<COMPARISON_FUNCTION>(Allocator, COMPARISON_FUNC_UNKNOWN, COMPARISON_FUNC_NUM_FUNCTIONS)); |
49 | 49 |
|
50 | | - ASSERT_TRUE(TestEnum<PRIMITIVE_TOPOLOGY>(Allocator, PRIMITIVE_TOPOLOGY_UNDEFINED, PRIMITIVE_TOPOLOGY_NUM_TOPOLOGIES)); |
| 50 | + EXPECT_TRUE(TestEnum<PRIMITIVE_TOPOLOGY>(Allocator, PRIMITIVE_TOPOLOGY_UNDEFINED, PRIMITIVE_TOPOLOGY_NUM_TOPOLOGIES)); |
51 | 51 |
|
52 | | - ASSERT_TRUE(TestEnum<RENDER_DEVICE_TYPE>(Allocator, RENDER_DEVICE_TYPE_UNDEFINED, RENDER_DEVICE_TYPE_COUNT)); |
| 52 | + EXPECT_TRUE(TestEnum<RENDER_DEVICE_TYPE>(Allocator, RENDER_DEVICE_TYPE_UNDEFINED, RENDER_DEVICE_TYPE_COUNT)); |
53 | 53 |
|
54 | | - ASSERT_TRUE(TestEnum<ADAPTER_TYPE>(Allocator, ADAPTER_TYPE_UNKNOWN, ADAPTER_TYPE_DISCRETE)); |
| 54 | + EXPECT_TRUE(TestEnum<ADAPTER_TYPE>(Allocator, ADAPTER_TYPE_UNKNOWN, ADAPTER_TYPE_DISCRETE)); |
55 | 55 |
|
56 | | - ASSERT_TRUE(TestEnum<DEVICE_FEATURE_STATE>(Allocator, DEVICE_FEATURE_STATE_DISABLED, DEVICE_FEATURE_STATE_OPTIONAL)); |
| 56 | + EXPECT_TRUE(TestEnum<DEVICE_FEATURE_STATE>(Allocator, DEVICE_FEATURE_STATE_DISABLED, DEVICE_FEATURE_STATE_OPTIONAL)); |
57 | 57 |
|
58 | | - ASSERT_TRUE(TestBitwiseEnum<SAMPLE_COUNT>(Allocator, SAMPLE_COUNT_MAX)); |
| 58 | + EXPECT_TRUE(TestBitwiseEnum<SAMPLE_COUNT>(Allocator, SAMPLE_COUNT_MAX)); |
59 | 59 |
|
60 | | - ASSERT_TRUE(TestBitwiseEnum<RESOURCE_STATE>(Allocator, RESOURCE_STATE_MAX_BIT)); |
| 60 | + EXPECT_TRUE(TestBitwiseEnum<RESOURCE_STATE>(Allocator, RESOURCE_STATE_MAX_BIT)); |
61 | 61 | } |
62 | 62 |
|
63 | 63 | TEST(Tools_RenderStateNotationParser, ParseVersion) |
@@ -129,7 +129,8 @@ TEST(Tools_RenderStateNotationParser, ParseDeviceFeatures) |
129 | 129 | DescReference.NativeMultiDraw = DEVICE_FEATURE_STATE_OPTIONAL; |
130 | 130 | DescReference.AsyncShaderCompilation = DEVICE_FEATURE_STATE_ENABLED; |
131 | 131 | DescReference.FormattedBuffers = DEVICE_FEATURE_STATE_OPTIONAL; |
132 | | - static_assert(sizeof(DescReference) == 47, "Did you add a new feature? Please add it to the test"); |
| 132 | + DescReference.SpecializationConstants = DEVICE_FEATURE_STATE_ENABLED; |
| 133 | + static_assert(sizeof(DescReference) == 48, "Did you add a new feature? Please add it to the test"); |
133 | 134 |
|
134 | 135 | DeviceFeatures Desc{}; |
135 | 136 | ParseRSN(JsonReference, Desc, Allocator); |
|
0 commit comments