Skip to content

Commit 6d925f8

Browse files
Update render state notation device feature parser test to use SpecializationConstants
1 parent 4de7a2b commit 6d925f8

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

Tests/DiligentToolsTest/assets/RenderStates/GraphicsTypes/DeviceFeatures.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@
4343
"TextureSubresourceViews": "ENABLED",
4444
"NativeMultiDraw": "OPTIONAL",
4545
"AsyncShaderCompilation": "ENABLED",
46-
"FormattedBuffers": "OPTIONAL"
46+
"FormattedBuffers": "OPTIONAL",
47+
"SpecializationConstants": "ENABLED"
4748
}

Tests/DiligentToolsTest/src/RenderStateNotationParser/GraphicsTypesParserTest.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2026 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,27 +37,27 @@ TEST(Tools_RenderStateNotationParser, ParseGraphicsTypesEnums)
3737
{
3838
DynamicLinearAllocator Allocator{DefaultRawMemoryAllocator::GetAllocator()};
3939

40-
ASSERT_TRUE(TestEnum<VALUE_TYPE>(Allocator, VT_UNDEFINED, VT_NUM_TYPES));
40+
EXPECT_TRUE(TestEnum<VALUE_TYPE>(Allocator, VT_UNDEFINED, VT_NUM_TYPES));
4141

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));
4343

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));
4545

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));
4747

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));
4949

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));
5151

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));
5353

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));
5555

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));
5757

58-
ASSERT_TRUE(TestBitwiseEnum<SAMPLE_COUNT>(Allocator, SAMPLE_COUNT_MAX));
58+
EXPECT_TRUE(TestBitwiseEnum<SAMPLE_COUNT>(Allocator, SAMPLE_COUNT_MAX));
5959

60-
ASSERT_TRUE(TestBitwiseEnum<RESOURCE_STATE>(Allocator, RESOURCE_STATE_MAX_BIT));
60+
EXPECT_TRUE(TestBitwiseEnum<RESOURCE_STATE>(Allocator, RESOURCE_STATE_MAX_BIT));
6161
}
6262

6363
TEST(Tools_RenderStateNotationParser, ParseVersion)
@@ -129,7 +129,8 @@ TEST(Tools_RenderStateNotationParser, ParseDeviceFeatures)
129129
DescReference.NativeMultiDraw = DEVICE_FEATURE_STATE_OPTIONAL;
130130
DescReference.AsyncShaderCompilation = DEVICE_FEATURE_STATE_ENABLED;
131131
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");
133134

134135
DeviceFeatures Desc{};
135136
ParseRSN(JsonReference, Desc, Allocator);

0 commit comments

Comments
 (0)