Skip to content

Commit 159f2be

Browse files
Add RSN parser test coverage for TextureUpdateOffsetAlignment and TextureUpdateStrideAlignment
1 parent 6d925f8 commit 159f2be

File tree

3 files changed

+38
-28
lines changed

3 files changed

+38
-28
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"ConstantBufferOffsetAlignment": 64,
3-
"StructuredBufferOffsetAlignment": 128
3+
"StructuredBufferOffsetAlignment": 128,
4+
"TextureUpdateOffsetAlignment": 512,
5+
"TextureUpdateStrideAlignment": 256
46
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"Description": "NVIDIA: RTX 2080",
33
"Buffer": {
4-
"ConstantBufferOffsetAlignment": 64
4+
"ConstantBufferOffsetAlignment": 64,
5+
"StructuredBufferOffsetAlignment": 128,
6+
"TextureUpdateOffsetAlignment": 512,
7+
"TextureUpdateStrideAlignment": 256
58
},
69
"ComputeShader": {
710
"SharedMemorySize": 1024

Tests/DiligentToolsTest/src/RenderStateNotationParser/GraphicsTypesParserTest.cpp

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ TEST(Tools_RenderStateNotationParser, ParseWaveOpProperties)
200200
ASSERT_EQ(Desc, DescReference);
201201
}
202202

203-
TEST(Tools_RenderStateNotationParser, ParseBufferPropertiess)
203+
TEST(Tools_RenderStateNotationParser, ParseBufferProperties)
204204
{
205-
CHECK_STRUCT_SIZE(BufferProperties, 8);
205+
CHECK_STRUCT_SIZE(BufferProperties, 16);
206206

207207
DynamicLinearAllocator Allocator{DefaultRawMemoryAllocator::GetAllocator()};
208208

@@ -211,6 +211,8 @@ TEST(Tools_RenderStateNotationParser, ParseBufferPropertiess)
211211
BufferProperties DescReference{};
212212
DescReference.ConstantBufferOffsetAlignment = 64;
213213
DescReference.StructuredBufferOffsetAlignment = 128;
214+
DescReference.TextureUpdateOffsetAlignment = 512;
215+
DescReference.TextureUpdateStrideAlignment = 256;
214216

215217
BufferProperties Desc{};
216218
ParseRSN(JsonReference, Desc, Allocator);
@@ -461,36 +463,39 @@ TEST(Tools_RenderStateNotationParser, ParseCommandQueueInfo)
461463

462464
TEST(Tools_RenderStateNotationParser, ParseGraphicsAdapterInfo)
463465
{
464-
CHECK_STRUCT_SIZE(GraphicsAdapterInfo, 824);
466+
CHECK_STRUCT_SIZE(GraphicsAdapterInfo, 832);
465467

466468
DynamicLinearAllocator Allocator{DefaultRawMemoryAllocator::GetAllocator()};
467469

468470
nlohmann::json JsonReference = LoadDRSNFromFile("RenderStates/GraphicsTypes/GraphicsAdapterInfo.json");
469471

470472
GraphicsAdapterInfo DescReference{};
471-
DescReference.Type = ADAPTER_TYPE_DISCRETE;
472-
DescReference.Vendor = ADAPTER_VENDOR_NVIDIA;
473-
DescReference.VendorId = 8;
474-
DescReference.DeviceId = 128;
475-
DescReference.NumOutputs = 1;
476-
DescReference.Memory.LocalMemory = 256;
477-
DescReference.RayTracing.BoxBufferAlignment = 64;
478-
DescReference.WaveOp.MinSize = 1;
479-
DescReference.Buffer.ConstantBufferOffsetAlignment = 64;
480-
DescReference.Texture.CubemapArraysSupported = true;
481-
DescReference.Sampler.MaxAnisotropy = 8;
482-
DescReference.MeshShader.MaxThreadGroupCountX = 10;
483-
DescReference.MeshShader.MaxThreadGroupCountY = 20;
484-
DescReference.MeshShader.MaxThreadGroupCountZ = 30;
485-
DescReference.MeshShader.MaxThreadGroupTotalCount = 100;
486-
DescReference.ShadingRate.Combiners = SHADING_RATE_COMBINER_OVERRIDE;
487-
DescReference.ComputeShader.SharedMemorySize = 1024;
488-
DescReference.DrawCommand.MaxDrawIndirectCount = 4;
489-
DescReference.SparseResources.AddressSpaceSize = 64;
490-
DescReference.Features.GeometryShaders = DEVICE_FEATURE_STATE_ENABLED;
491-
DescReference.NumQueues = 2;
492-
DescReference.Queues[0].QueueType = COMMAND_QUEUE_TYPE_COMPUTE;
493-
DescReference.Queues[1].QueueType = COMMAND_QUEUE_TYPE_GRAPHICS;
473+
DescReference.Type = ADAPTER_TYPE_DISCRETE;
474+
DescReference.Vendor = ADAPTER_VENDOR_NVIDIA;
475+
DescReference.VendorId = 8;
476+
DescReference.DeviceId = 128;
477+
DescReference.NumOutputs = 1;
478+
DescReference.Memory.LocalMemory = 256;
479+
DescReference.RayTracing.BoxBufferAlignment = 64;
480+
DescReference.WaveOp.MinSize = 1;
481+
DescReference.Buffer.ConstantBufferOffsetAlignment = 64;
482+
DescReference.Buffer.StructuredBufferOffsetAlignment = 128;
483+
DescReference.Buffer.TextureUpdateOffsetAlignment = 512;
484+
DescReference.Buffer.TextureUpdateStrideAlignment = 256;
485+
DescReference.Texture.CubemapArraysSupported = true;
486+
DescReference.Sampler.MaxAnisotropy = 8;
487+
DescReference.MeshShader.MaxThreadGroupCountX = 10;
488+
DescReference.MeshShader.MaxThreadGroupCountY = 20;
489+
DescReference.MeshShader.MaxThreadGroupCountZ = 30;
490+
DescReference.MeshShader.MaxThreadGroupTotalCount = 100;
491+
DescReference.ShadingRate.Combiners = SHADING_RATE_COMBINER_OVERRIDE;
492+
DescReference.ComputeShader.SharedMemorySize = 1024;
493+
DescReference.DrawCommand.MaxDrawIndirectCount = 4;
494+
DescReference.SparseResources.AddressSpaceSize = 64;
495+
DescReference.Features.GeometryShaders = DEVICE_FEATURE_STATE_ENABLED;
496+
DescReference.NumQueues = 2;
497+
DescReference.Queues[0].QueueType = COMMAND_QUEUE_TYPE_COMPUTE;
498+
DescReference.Queues[1].QueueType = COMMAND_QUEUE_TYPE_GRAPHICS;
494499

495500
String Name = "NVIDIA: RTX 2080";
496501
memcpy(DescReference.Description, Name.c_str(), Name.size());

0 commit comments

Comments
 (0)