Skip to content

Commit

Permalink
Replace texture sampling with textureLoad in debug pass
Browse files Browse the repository at this point in the history 
- This will allow reading pixels directly from the depth buffer without
  having to create a comparison sampler for it.
  • Loading branch information
@Nelarius
Nelarius committed Mar 27, 2024
1 parent 558daae commit ab0708f
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 56 deletions.
88 changes: 50 additions & 38 deletions src/pt/hybrid_renderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ HybridRenderer::HybridRenderer(
mAlbedoTextureView(nullptr),
mNormalTexture(nullptr),
mNormalTextureView(nullptr),
mGbufferSampler(nullptr),
mGbufferBindGroupLayout(),
mGbufferBindGroup(),
mGbufferPass(gpuContext, rendererDesc),
Expand Down Expand Up @@ -132,49 +131,25 @@ HybridRenderer::HybridRenderer(
mNormalTexture, "Gbuffer normal texture view", NORMAL_TEXTURE_FORMAT);
NLRS_ASSERT(mNormalTextureView != nullptr);

{
const WGPUSamplerDescriptor desc{
.nextInChain = nullptr,
.label = "Gbuffer sampler",
.addressModeU = WGPUAddressMode_ClampToEdge,
.addressModeV = WGPUAddressMode_ClampToEdge,
.addressModeW = WGPUAddressMode_ClampToEdge,
.magFilter = WGPUFilterMode_Nearest,
.minFilter = WGPUFilterMode_Nearest,
.mipmapFilter = WGPUMipmapFilterMode_Nearest,
.lodMinClamp = 0.f,
.lodMaxClamp = 32.f,
.compare = WGPUCompareFunction_Undefined,
.maxAnisotropy = 1,
};
mGbufferSampler = wgpuDeviceCreateSampler(gpuContext.device, &desc);
NLRS_ASSERT(mGbufferSampler != nullptr);
}

mGbufferBindGroupLayout = GpuBindGroupLayout{
gpuContext.device,
"Gbuffer bind group layout",
std::array<WGPUBindGroupLayoutEntry, 3>{
samplerBindGroupLayoutEntry(0),
textureBindGroupLayoutEntry(1),
textureBindGroupLayoutEntry(2)}};
std::array<WGPUBindGroupLayoutEntry, 2>{
textureBindGroupLayoutEntry(0), textureBindGroupLayoutEntry(1)}};

mGbufferBindGroup = GpuBindGroup{
gpuContext.device,
"Gbuffer bind group",
mGbufferBindGroupLayout.ptr(),
std::array<WGPUBindGroupEntry, 3>{
samplerBindGroupEntry(0, mGbufferSampler),
textureBindGroupEntry(1, mAlbedoTextureView),
textureBindGroupEntry(2, mNormalTextureView)}};
std::array<WGPUBindGroupEntry, 2>{
textureBindGroupEntry(0, mAlbedoTextureView),
textureBindGroupEntry(1, mNormalTextureView)}};

mDebugPass = DebugPass{gpuContext, mGbufferBindGroupLayout};
mDebugPass = DebugPass{gpuContext, mGbufferBindGroupLayout, rendererDesc.framebufferSize};
}

HybridRenderer::~HybridRenderer()
{
samplerSafeRelease(mGbufferSampler);
mGbufferSampler = nullptr;
textureViewSafeRelease(mNormalTextureView);
mNormalTextureView = nullptr;
textureSafeRelease(mNormalTexture);
Expand Down Expand Up @@ -228,6 +203,8 @@ void HybridRenderer::resize(const GpuContext& gpuContext, const Extent2u& newSiz
{
NLRS_ASSERT(newSize.x > 0 && newSize.y > 0);

mDebugPass.resize(gpuContext, newSize);

textureViewSafeRelease(mNormalTextureView);
textureSafeRelease(mNormalTexture);
textureViewSafeRelease(mAlbedoTextureView);
Expand Down Expand Up @@ -304,10 +281,9 @@ void HybridRenderer::resize(const GpuContext& gpuContext, const Extent2u& newSiz
gpuContext.device,
"Gbuffer bind group",
mGbufferBindGroupLayout.ptr(),
std::array<WGPUBindGroupEntry, 3>{
samplerBindGroupEntry(0, mGbufferSampler),
textureBindGroupEntry(1, mAlbedoTextureView),
textureBindGroupEntry(2, mNormalTextureView)}};
std::array<WGPUBindGroupEntry, 2>{
textureBindGroupEntry(0, mAlbedoTextureView),
textureBindGroupEntry(1, mNormalTextureView)}};
}

HybridRenderer::GbufferPass::GbufferPass(
Expand Down Expand Up @@ -801,18 +777,42 @@ void HybridRenderer::GbufferPass::render(

HybridRenderer::DebugPass::DebugPass(
const GpuContext& gpuContext,
const GpuBindGroupLayout& gbufferBindGroupLayout)
const GpuBindGroupLayout& gbufferBindGroupLayout,
const Extent2u& framebufferSize)
: mVertexBuffer(
gpuContext.device,
"Vertex buffer",
WGPUBufferUsage_CopyDst | WGPUBufferUsage_Vertex,
std::span<const float[2]>(quadVertexData)),
mUniformBuffer(),
mUniformBindGroup(),
mPipeline(nullptr)
{
{
const auto uniformData = Extent2<float>{framebufferSize};
mUniformBuffer = GpuBuffer{
gpuContext.device,
"Uniform buffer",
WGPUBufferUsage_CopyDst | WGPUBufferUsage_Uniform,
std::span<const float>(&uniformData.x, sizeof(Extent2<float>))};
}

const GpuBindGroupLayout uniformBindGroupLayout{
gpuContext.device,
"Uniform bind group layout",
mUniformBuffer.bindGroupLayoutEntry(0, WGPUShaderStage_Fragment, sizeof(Extent2<float>))};

mUniformBindGroup = GpuBindGroup{
gpuContext.device,
"Uniform bind group",
uniformBindGroupLayout.ptr(),
mUniformBuffer.bindGroupEntry(0)};

{
// Pipeline layout

const std::array<WGPUBindGroupLayout, 1> bindGroupLayouts{gbufferBindGroupLayout.ptr()};
const std::array<WGPUBindGroupLayout, 2> bindGroupLayouts{
uniformBindGroupLayout.ptr(), gbufferBindGroupLayout.ptr()};

const WGPUPipelineLayoutDescriptor pipelineLayoutDesc{
.nextInChain = nullptr,
Expand Down Expand Up @@ -945,6 +945,8 @@ HybridRenderer::DebugPass::DebugPass(DebugPass&& other) noexcept
if (this != &other)
{
mVertexBuffer = std::move(other.mVertexBuffer);
mUniformBuffer = std::move(other.mUniformBuffer);
mUniformBindGroup = std::move(other.mUniformBindGroup);
mPipeline = other.mPipeline;
other.mPipeline = nullptr;
}
Expand All @@ -955,6 +957,8 @@ HybridRenderer::DebugPass& HybridRenderer::DebugPass::operator=(DebugPass&& othe
if (this != &other)
{
mVertexBuffer = std::move(other.mVertexBuffer);
mUniformBuffer = std::move(other.mUniformBuffer);
mUniformBindGroup = std::move(other.mUniformBindGroup);
renderPipelineSafeRelease(mPipeline);
mPipeline = other.mPipeline;
other.mPipeline = nullptr;
Expand Down Expand Up @@ -993,11 +997,19 @@ void HybridRenderer::DebugPass::render(
NLRS_ASSERT(renderPass != nullptr);

wgpuRenderPassEncoderSetPipeline(renderPass, mPipeline);
wgpuRenderPassEncoderSetBindGroup(renderPass, 0, gbufferBindGroup.ptr(), 0, nullptr);
wgpuRenderPassEncoderSetBindGroup(renderPass, 0, mUniformBindGroup.ptr(), 0, nullptr);
wgpuRenderPassEncoderSetBindGroup(renderPass, 1, gbufferBindGroup.ptr(), 0, nullptr);
wgpuRenderPassEncoderSetVertexBuffer(
renderPass, 0, mVertexBuffer.ptr(), 0, mVertexBuffer.byteSize());
wgpuRenderPassEncoderDraw(renderPass, 6, 1, 0, 0);

wgpuRenderPassEncoderEnd(renderPass);
}

void HybridRenderer::DebugPass::resize(const GpuContext& gpuContext, const Extent2u& newSize)
{
const auto uniformData = Extent2<float>{newSize};
wgpuQueueWriteBuffer(
gpuContext.queue, mUniformBuffer.ptr(), 0, &uniformData.x, sizeof(Extent2<float>));
}
} // namespace nlrs
9 changes: 7 additions & 2 deletions src/pt/hybrid_renderer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,16 @@ class HybridRenderer
{
private:
GpuBuffer mVertexBuffer = GpuBuffer{};
GpuBuffer mUniformBuffer = GpuBuffer{};
GpuBindGroup mUniformBindGroup = GpuBindGroup{};
WGPURenderPipeline mPipeline = nullptr;

public:
DebugPass() = default;
DebugPass(const GpuContext& gpuContext, const GpuBindGroupLayout& gbufferBindGroupLayout);
DebugPass(
const GpuContext& gpuContext,
const GpuBindGroupLayout& gbufferBindGroupLayout,
const Extent2u& framebufferSize);
~DebugPass();

DebugPass(const DebugPass&) = delete;
Expand All @@ -116,6 +121,7 @@ class HybridRenderer
const GpuBindGroup& gbufferBindGroup,
WGPUCommandEncoder encoder,
WGPUTextureView textureView);
void resize(const GpuContext&, const Extent2u&);
};

WGPUTexture mDepthTexture;
Expand All @@ -124,7 +130,6 @@ class HybridRenderer
WGPUTextureView mAlbedoTextureView;
WGPUTexture mNormalTexture;
WGPUTextureView mNormalTextureView;
WGPUSampler mGbufferSampler;
GpuBindGroupLayout mGbufferBindGroupLayout;
GpuBindGroup mGbufferBindGroup;
GbufferPass mGbufferPass;
Expand Down
14 changes: 6 additions & 8 deletions src/pt/hybrid_renderer_debug_pass.wgsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,18 @@ fn vsMain(in: VertexInput) -> VertexOutput {
return out;
}

@group(0) @binding(0) var textureSampler: sampler;
@group(0) @binding(1) var gbufferAlbedo: texture_2d<f32>;
@group(0) @binding(2) var gbufferNormal: texture_2d<f32>;
@group(0) @binding(0) var<uniform> framebufferSize: vec2f;
@group(1) @binding(0) var gbufferAlbedo: texture_2d<f32>;
@group(1) @binding(1) var gbufferNormal: texture_2d<f32>;

@fragment
fn fsMain(in: VertexOutput) -> @location(0) vec4f {
// NOTE: textureSample can't be called from non-uniform control flow
// TODO: replace with textureLoad calls which can be called from non-uniform control flow and get rid of the sampler
let c = in.texCoord;
let a = textureSample(gbufferAlbedo, textureSampler, c);
let n = textureSample(gbufferNormal, textureSampler, c);
let idx = vec2u(floor(c * framebufferSize));
if c.x < 0.5 {
return a;
return textureLoad(gbufferAlbedo, idx, 0);
} else {
let n = textureLoad(gbufferNormal, idx, 0);
return vec4(vec3(0.5) * (n.xyz + vec3(1f)), 1.0);
}
}
14 changes: 6 additions & 8 deletions src/pt/shader_source.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -756,20 +756,18 @@ fn vsMain(in: VertexInput) -> VertexOutput {
return out;
}
@group(0) @binding(0) var textureSampler: sampler;
@group(0) @binding(1) var gbufferAlbedo: texture_2d<f32>;
@group(0) @binding(2) var gbufferNormal: texture_2d<f32>;
@group(0) @binding(0) var<uniform> framebufferSize: vec2f;
@group(1) @binding(0) var gbufferAlbedo: texture_2d<f32>;
@group(1) @binding(1) var gbufferNormal: texture_2d<f32>;
@fragment
fn fsMain(in: VertexOutput) -> @location(0) vec4f {
// NOTE: textureSample can't be called from non-uniform control flow
// TODO: replace with textureLoad calls which can be called from non-uniform control flow and get rid of the sampler
let c = in.texCoord;
let a = textureSample(gbufferAlbedo, textureSampler, c);
let n = textureSample(gbufferNormal, textureSampler, c);
let idx = vec2u(floor(c * framebufferSize));
if c.x < 0.5 {
return a;
return textureLoad(gbufferAlbedo, idx, 0);
} else {
let n = textureLoad(gbufferNormal, idx, 0);
return vec4(vec3(0.5) * (n.xyz + vec3(1f)), 1.0);
}
}
Expand Down

0 comments on commit ab0708f

Please sign in to comment.