From 97dfda3c3ca06db04b98f8c825896584b172c312 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 11 Oct 2021 12:18:15 +0100 Subject: [PATCH] Fix use of GetCBufferVariableContents in tests --- util/test/rdtest/shared/Buffer_Truncation.py | 2 +- util/test/tests/D3D11/D3D11_CBuffer_Zoo.py | 2 +- util/test/tests/D3D12/D3D12_CBuffer_Zoo.py | 6 +++--- util/test/tests/GL/GL_CBuffer_Zoo.py | 4 ++-- util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py | 2 +- util/test/tests/Vulkan/VK_CBuffer_Zoo.py | 10 +++++----- util/test/tests/Vulkan/VK_Robustness2.py | 2 +- util/test/tests/Vulkan/VK_Spec_Constants.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/util/test/rdtest/shared/Buffer_Truncation.py b/util/test/rdtest/shared/Buffer_Truncation.py index 1bb474240..81bd990c4 100644 --- a/util/test/rdtest/shared/Buffer_Truncation.py +++ b/util/test/rdtest/shared/Buffer_Truncation.py @@ -107,7 +107,7 @@ class Buffer_Truncation(rdtest.TestCase): self.check(cbuf.byteSize == 256) variables = self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize) diff --git a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py index 6adaf69c4..06e2acd92 100644 --- a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py +++ b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py @@ -19,7 +19,7 @@ class D3D11_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) diff --git a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py index 033c7ab90..2281a465e 100644 --- a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py +++ b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py @@ -75,7 +75,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -83,7 +83,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): root_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 1, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -91,7 +91,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): huge_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 2, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) diff --git a/util/test/tests/GL/GL_CBuffer_Zoo.py b/util/test/tests/GL/GL_CBuffer_Zoo.py index 5652b8702..637439e6e 100644 --- a/util/test/tests/GL/GL_CBuffer_Zoo.py +++ b/util/test/tests/GL/GL_CBuffer_Zoo.py @@ -19,7 +19,7 @@ class GL_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -435,7 +435,7 @@ class GL_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 1, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) diff --git a/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py b/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py index 40dbdf927..606164dec 100644 --- a/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py +++ b/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py @@ -20,7 +20,7 @@ class VK_Adv_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) diff --git a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py index 18cf8558d..53ce74862 100644 --- a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py +++ b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py @@ -28,7 +28,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -40,7 +40,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): inline_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 1, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -57,7 +57,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 2, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -96,7 +96,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) @@ -108,7 +108,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): inline_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(stage), + pipe.GetShader(stage), stage, pipe.GetShaderEntryPoint(stage), 1, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) diff --git a/util/test/tests/Vulkan/VK_Robustness2.py b/util/test/tests/Vulkan/VK_Robustness2.py index 62ac37d22..158d4e45c 100644 --- a/util/test/tests/Vulkan/VK_Robustness2.py +++ b/util/test/tests/Vulkan/VK_Robustness2.py @@ -84,7 +84,7 @@ class VK_Robustness2(rdtest.TestCase): var_check = rdtest.ConstantBufferChecker( self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(rd.ShaderStage.Fragment), refl.entryPoint, i, + pipe.GetShader(rd.ShaderStage.Fragment), rd.ShaderStage.Fragment, refl.entryPoint, i, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)) if cb.bufferBacked: diff --git a/util/test/tests/Vulkan/VK_Spec_Constants.py b/util/test/tests/Vulkan/VK_Spec_Constants.py index 60b023510..17fb7cf9d 100644 --- a/util/test/tests/Vulkan/VK_Spec_Constants.py +++ b/util/test/tests/Vulkan/VK_Spec_Constants.py @@ -34,7 +34,7 @@ class VK_Spec_Constants(rdtest.TestCase): cbuf: rd.BoundCBuffer = pipe.GetConstantBuffer(rd.ShaderStage.Pixel, 0, 0) cb_vars = self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(rd.ShaderStage.Pixel), + pipe.GetShader(rd.ShaderStage.Pixel), rd.ShaderStage.Pixel, pipe.GetShaderEntryPoint(rd.ShaderStage.Pixel), 0, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize) @@ -57,7 +57,7 @@ class VK_Spec_Constants(rdtest.TestCase): cbuf: rd.BoundCBuffer = pipe.GetConstantBuffer(rd.ShaderStage.Pixel, 1, 0) cb_vars = self.controller.GetCBufferVariableContents(pipe.GetGraphicsPipelineObject(), - pipe.GetShader(rd.ShaderStage.Pixel), + pipe.GetShader(rd.ShaderStage.Pixel), rd.ShaderStage.Pixel, pipe.GetShaderEntryPoint(rd.ShaderStage.Pixel), 1, cbuf.resourceId, cbuf.byteOffset, cbuf.byteSize)