From 52ceff4beee7cdc7d47eb9292a35e9f610a80bdc Mon Sep 17 00:00:00 2001 From: "YONGH\\yongh" Date: Wed, 25 Oct 2017 17:59:45 -0400 Subject: add new test mode: COMPARE_RENDER_COMPUTE, which runs a input vertex/fragment shader pair, but instead of comparing the resulting framebuffer, it expects the test shader to write results into a UAV, and compares the pixel shader UAV output to the reference output. --- tools/render-test/shader-input-layout.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tools/render-test/shader-input-layout.cpp') diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp index 47ba767ae..ef78fe3d5 100644 --- a/tools/render-test/shader-input-layout.cpp +++ b/tools/render-test/shader-input-layout.cpp @@ -171,8 +171,8 @@ namespace renderer_test else break; } + parser.Read(")"); } - parser.Read(")"); // parse bindings if (parser.LookAhead(":")) { @@ -190,11 +190,13 @@ namespace renderer_test { parser.ReadToken(); parser.Read("("); - entry.glslBinding = entry.glslLocation = parser.ReadInt(); - if (parser.LookAhead(",")) + while (!parser.IsEnd() && !parser.LookAhead(")")) { - parser.Read(","); - entry.glslLocation = parser.ReadInt(); + entry.glslBinding.Add(parser.ReadInt()); + if (parser.LookAhead(",")) + parser.Read(","); + else + break; } parser.Read(")"); } @@ -223,7 +225,7 @@ namespace renderer_test int arrLen = inputDesc.arrayLength; if (arrLen == 0) arrLen = 1; - List> dataBuffer; + List> & dataBuffer = output.dataBuffer; int arraySize = arrLen; if (inputDesc.isCube) arraySize *= 6; -- cgit v1.2.3