From 4a5bd147e16c863c8a42c193f1cf322becfdff21 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 1 Jun 2020 21:43:00 +0100 Subject: [PATCH] Fix Draw_Zoo tests --- renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp | 4 ++-- util/test/rdtest/analyse.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp index 3c7c325ce..44e33b0c6 100644 --- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp @@ -1512,7 +1512,7 @@ ShaderVariable Debugger::ReadFromPointer(const ShaderVariable &ptr) const if(ret.rows > 1) { // matrix case - ClampScalars(apiWrapper, ptr, scalar0, scalar1); + ClampScalars(apiWrapper, ret, scalar0, scalar1); if(scalar0 != ~0U && scalar1 != ~0U) { @@ -1545,7 +1545,7 @@ ShaderVariable Debugger::ReadFromPointer(const ShaderVariable &ptr) const } else { - ClampScalars(apiWrapper, ptr, scalar0); + ClampScalars(apiWrapper, ret, scalar0); // vector case, selecting a scalar (if anything) if(scalar0 != ~0U) diff --git a/util/test/rdtest/analyse.py b/util/test/rdtest/analyse.py index 7ecd64e2c..5336d31f3 100644 --- a/util/test/rdtest/analyse.py +++ b/util/test/rdtest/analyse.py @@ -127,12 +127,13 @@ def get_vsin_attrs(controller: rd.ReplayController, vertexOffset: int, index_mes attr.name = a.name attr.mesh = rd.MeshFormat(index_mesh) - offs = a.byteOffset + vertexOffset * attr.mesh.vertexByteStride - attr.mesh.vertexByteStride = vbs[a.vertexBuffer].byteStride attr.mesh.instStepRate = a.instanceRate attr.mesh.instanced = a.perInstance attr.mesh.vertexResourceId = vbs[a.vertexBuffer].resourceId + + offs = a.byteOffset + vertexOffset * attr.mesh.vertexByteStride + attr.mesh.vertexByteOffset = vbs[a.vertexBuffer].byteOffset + offs attr.mesh.vertexByteSize = max([0, vbs[a.vertexBuffer].byteSize - offs])