From a351fc14f472ca7225bec1263cdca1843ab27f73 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 24 May 2022 12:48:17 +0100 Subject: [PATCH] Fix tests for API changes --- util/test/tests/D3D12/D3D12_Reflection_Zoo.py | 34 +++++++++---------- util/test/tests/Vulkan/VK_Spec_Constants.py | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py index 186d8d20c..0d7050a57 100644 --- a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py @@ -75,29 +75,29 @@ class D3D12_Reflection_Zoo(rdtest.TestCase): } def buf_struct_check(type: rd.ShaderConstantType): - self.check(type.descriptor.name == 'buf_struct') + self.check(type.name == 'buf_struct') self.check(len(type.members) == 3) self.check(type.members[0].name == 'a') - self.check(type.members[0].type.descriptor.type == rd.VarType.Float) - self.check(type.members[0].type.descriptor.rows == 1) - self.check(type.members[0].type.descriptor.columns == 1) - self.check(type.members[0].type.descriptor.elements == 1) + self.check(type.members[0].type.baseType == rd.VarType.Float) + self.check(type.members[0].type.rows == 1) + self.check(type.members[0].type.columns == 1) + self.check(type.members[0].type.elements == 1) self.check(type.members[1].name == 'b') - self.check(type.members[1].type.descriptor.type == rd.VarType.Float) - self.check(type.members[1].type.descriptor.rows == 1) - self.check(type.members[1].type.descriptor.columns == 1) - self.check(type.members[1].type.descriptor.elements == 2) + self.check(type.members[1].type.baseType == rd.VarType.Float) + self.check(type.members[1].type.rows == 1) + self.check(type.members[1].type.columns == 1) + self.check(type.members[1].type.elements == 2) self.check(type.members[2].name == 'c') - self.check(type.members[2].type.descriptor.name == 'nested') + self.check(type.members[2].type.name == 'nested') self.check(len(type.members[2].type.members) == 1) self.check(type.members[2].type.members[0].name == 'x') - self.check(type.members[2].type.members[0].type.descriptor.type == rd.VarType.Float) - self.check(type.members[2].type.members[0].type.descriptor.rows == 2) - self.check(type.members[2].type.members[0].type.descriptor.columns == 3) - self.check(type.members[2].type.members[0].type.descriptor.RowMajor()) + self.check(type.members[2].type.members[0].type.baseType == rd.VarType.Float) + self.check(type.members[2].type.members[0].type.rows == 2) + self.check(type.members[2].type.members[0].type.columns == 3) + self.check(type.members[2].type.members[0].type.RowMajor()) return @@ -216,9 +216,9 @@ class D3D12_Reflection_Zoo(rdtest.TestCase): if check['structVarCheck']: check['structVarCheck'](res.variableType) else: - self.check(res.variableType.descriptor.type == check['varType']) - self.check(res.variableType.descriptor.name == check['typeName']) - self.check(res.variableType.descriptor.columns == check['columns']) + self.check(res.variableType.baseType == check['varType']) + self.check(res.variableType.name == check['typeName']) + self.check(res.variableType.columns == check['columns']) self.check(bind.bind == check['register']) self.check(bind.arraySize == check['regCount']) diff --git a/util/test/tests/Vulkan/VK_Spec_Constants.py b/util/test/tests/Vulkan/VK_Spec_Constants.py index 4c71d6a35..b9db33086 100644 --- a/util/test/tests/Vulkan/VK_Spec_Constants.py +++ b/util/test/tests/Vulkan/VK_Spec_Constants.py @@ -28,7 +28,7 @@ class VK_Spec_Constants(rdtest.TestCase): self.check(len(shader.constantBlocks[1].variables) == 3) # should be an array of num_colors+1 elements - array_len = shader.constantBlocks[0].variables[0].type.descriptor.elements + array_len = shader.constantBlocks[0].variables[0].type.elements if not rdtest.value_compare(array_len, num_colors+1): raise rdtest.TestFailureException("CBuffer variable is array of {}, not {}".format(array_len, num_colors+1))