lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-27 17:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle implicit lod samples by pushing in calculated derivatives

Browse Source
This commit is contained in:
baldurk
2020-04-13 18:24:47 +01:00
parent 8192dab204
commit a9f7819bf7
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_shaderdebug.cpp
+20 -6
View File
@@ -577,6 +577,24 @@ public:
params.ddy.z = ddy.value.f.z;
}
if(opcode == rdcspv::Op::ImageSampleImplicitLod)
{
// use grad to sub in for the implicit lod
params.useGrad = VK_TRUE;
params.ddx.x = ddxCalc.value.f.x;
if(gradCoords >= 2)
params.ddx.y = ddxCalc.value.f.y;
if(gradCoords >= 3)
params.ddx.z = ddxCalc.value.f.z;
params.ddy.x = ddyCalc.value.f.x;
if(gradCoords >= 2)
params.ddy.y = ddyCalc.value.f.y;
if(gradCoords >= 3)
params.ddy.z = ddyCalc.value.f.z;
}
if(operands.flags & rdcspv::ImageOperands::ConstOffset)
{
ShaderVariable constOffset = lane.GetSrc(operands.constOffset);
@@ -1109,8 +1127,6 @@ private:
rdcspv::OperationList cases;
rdcspv::Op op;
rdcspv::Id texel_coord[(uint32_t)ShaderDebugBind::Count] = {
rdcspv::Id(),
texel_uv, // 1D - u and array
@@ -1162,7 +1178,7 @@ private:
uint32_t i = (uint32_t)ShaderDebugBind::Tex2D;
{
{
op = rdcspv::Op::ImageFetch;
rdcspv::Op op = rdcspv::Op::ImageFetch;
rdcspv::Id label = editor.MakeId();
targets.push_back({(uint32_t)op * 10 + i, label});
@@ -1181,10 +1197,8 @@ private:
cases.add(rdcspv::OpBranch(breakLabel));
}
for(rdcspv::Op op : {rdcspv::Op::ImageSampleExplicitLod, rdcspv::Op::ImageSampleImplicitLod})
{
op = rdcspv::Op::ImageSampleExplicitLod;
op = rdcspv::Op::ImageSampleImplicitLod;
rdcspv::Id label = editor.MakeId();
targets.push_back({(uint32_t)op * 10 + i, label});
util/test/demos/vk/vk_shader_debug_zoo.cpp
+6 -1
View File
@@ -117,7 +117,7 @@ layout(set = 0, binding = 2) uniform sampler linearSampler;
layout(set = 0, binding = 3) uniform texture2D sampledImage;
//layout(set = 0, binding = 4) uniform sampler2D linearSampledImage;
layout(set = 0, binding = 4) uniform sampler2D linearSampledImage;
/*
layout(set = 0, binding = 5, std430) buffer storebuftype
@@ -353,6 +353,11 @@ void main()
Color = textureLod(sampler2D(sampledImage, linearSampler), coord, 0.0);
break;
}
case 34:
{
Color = texture(linearSampledImage, inpos);
break;
}
default: break;
}
}