From f8ff6b4f6c852497bba488244ba59aa536ac318d Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 12 Dec 2019 13:38:42 +0000 Subject: [PATCH] Fix parameters for rendering 3D depth images in texture zoos --- util/test/demos/d3d11/d3d11_texture_zoo.cpp | 2 +- util/test/demos/d3d12/d3d12_texture_zoo.cpp | 2 +- util/test/demos/gl/gl_texture_zoo.cpp | 2 +- util/test/demos/vk/vk_texture_zoo.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/test/demos/d3d11/d3d11_texture_zoo.cpp b/util/test/demos/d3d11/d3d11_texture_zoo.cpp index 6a12f2a66..d027f0b51 100644 --- a/util/test/demos/d3d11/d3d11_texture_zoo.cpp +++ b/util/test/demos/d3d11/d3d11_texture_zoo.cpp @@ -980,7 +980,7 @@ int4 main(float4 pos : SV_Position, uint samp : SV_SampleIndex) : SV_Target0 // need to do each sample separately to let us vary the stencil value for(UINT sm = 0; sm < SampleCount; sm++) { - Vec4i params(sl, mp); + Vec4i params(tex3 ? 0 : sl, mp, 0, tex3 ? sl : 0); ctx->UpdateSubresource(mscb, 0, NULL, ¶ms, sizeof(params), sizeof(params)); ctx->OMSetBlendState(NULL, NULL, 1 << sm); diff --git a/util/test/demos/d3d12/d3d12_texture_zoo.cpp b/util/test/demos/d3d12/d3d12_texture_zoo.cpp index 87c57e69b..db1df1c08 100644 --- a/util/test/demos/d3d12/d3d12_texture_zoo.cpp +++ b/util/test/demos/d3d12/d3d12_texture_zoo.cpp @@ -1053,7 +1053,7 @@ int4 main(float4 pos : SV_Position, uint samp : SV_SampleIndex) : SV_Target0 cmd->SetPipelineState(pso); - Vec4i params(sl, mp); + Vec4i params(tex3d ? 0 : sl, mp, 0, tex3d ? sl : 0); cmd->SetGraphicsRoot32BitConstants(0, 4, ¶ms, 0); cmd->OMSetStencilRef(100 + (mp + sm) * 10); diff --git a/util/test/demos/gl/gl_texture_zoo.cpp b/util/test/demos/gl/gl_texture_zoo.cpp index d5152a022..63df5a850 100644 --- a/util/test/demos/gl/gl_texture_zoo.cpp +++ b/util/test/demos/gl/gl_texture_zoo.cpp @@ -870,7 +870,7 @@ void main() glUniform1ui(glGetUniformLocation(p, "texWidth"), texWidth); - glUniform1ui(glGetUniformLocation(p, "slice"), sl); + glUniform1ui(glGetUniformLocation(p, "slice"), t.dim == 3 ? 0 : sl); glUniform1ui(glGetUniformLocation(p, "mip"), mp); glUniform1ui(glGetUniformLocation(p, "flags"), flags); glUniform1ui(glGetUniformLocation(p, "zlayer"), t.dim == 3 ? sl : 0); diff --git a/util/test/demos/vk/vk_texture_zoo.cpp b/util/test/demos/vk/vk_texture_zoo.cpp index c4042339c..bbf5c8576 100644 --- a/util/test/demos/vk/vk_texture_zoo.cpp +++ b/util/test/demos/vk/vk_texture_zoo.cpp @@ -1318,7 +1318,7 @@ void main() vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipe); - Vec4i params(sl, mp); + Vec4i params(tex3d ? 0 : sl, mp, 0, tex3d ? sl : 0); vkCmdPushConstants(cmd, layout, VK_SHADER_STAGE_ALL, 0, sizeof(params), ¶ms); vkCmdSetStencilReference(cmd, VK_STENCIL_FACE_FRONT_AND_BACK, 100 + (mp + sm) * 10);