Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validation Error Fixes #886

Merged
merged 13 commits into from
Feb 6, 2025
Merged

Validation Error Fixes #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
32e5417
Got rid of most Validation Errors, still have two sets of errors rela…
jaremieromer Jan 25, 2025
c113c47
Adding buffers
jaremieromer Jan 29, 2025
92e3b4f
Cleaned up some visual noise by reducing redundancies in resource names
jaremieromer Jan 29, 2025
31f6547
Changed wireframe to match the other uniform buffers
jaremieromer Jan 29, 2025
043ec87
Merge branch 'jare-rename-resources' of https://github.com/NcStudios/…
jaremieromer Jan 29, 2025
a75e94f
Still need cleanup. No Errors!
jaremieromer Feb 4, 2025
3d5b001
Cleaned up passes
jaremieromer Feb 5, 2025
2ceb670
Merge branch 'vnext' of https://github.com/NcStudios/NcEngine into ja…
jaremieromer Feb 5, 2025
22cfeae
Get tests passing
jaremieromer Feb 5, 2025
7fe3aec
Code review feedback
jaremieromer Feb 6, 2025
0b6b4c4
pipeline fixes
jaremieromer Feb 6, 2025
d4f2c4d
Pipeline fix v2
jaremieromer Feb 6, 2025
8015445
Fixed test
jaremieromer Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/linux_setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ runs:
shell: bash
run: |
sudo apt-get install -y mesa-vulkan-drivers
wget "https://sdk.lunarg.com/sdk/download/${{ inputs.sdkVersion }}/linux/vulkan-sdk-linux-x86_64-${{ inputs.sdkVersion }}.tar.gz?Human=true" -O vulkan-sdk.tar.gz
tar xf vulkan-sdk.tar.gz
wget "https://sdk.lunarg.com/sdk/download/${{ inputs.sdkVersion }}/linux/vulkansdk-linux-x86_64-${{ inputs.sdkVersion }}.tar.xz" -O vulkan-sdk.tar.xz
tar xf vulkan-sdk.tar.xz
mv ${{ inputs.sdkVersion }} ${{ github.workspace }}/VulkanSDK

echo "VULKAN_SDK=${{ github.workspace }}/VulkanSDK/x86_64" >> $GITHUB_ENV
Expand Down
26 changes: 17 additions & 9 deletions resources/shaders/PPEnd.psh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@

Texture2D ColorSinks[];
Texture2D DepthSinks[];
Texture2D PostProcessSinks[];
SamplerState ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix

cbuffer SinkIndices
{
uint colorRT1;
uint colorRT2;
uint colorRT3;
uint colorRT4;
uint depthRT1;
uint depthRT2;
uint depthRT3;
uint depthRT4;
int colorRT1;
int colorRT2;
int colorRT3;
int colorRT4;
int depthRT1;
int depthRT2;
int depthRT3;
uint hasPostProcess;
};

struct PSInput
Expand All @@ -32,5 +33,12 @@ struct PSOutput

void main(in PSInput PSIn, out PSOutput PSOut)
{
PSOut.Color = ColorSinks[colorRT1].Sample(ColorSinks_sampler, PSIn.UV);;
if (hasPostProcess == 1)
{
PSOut.Color = PostProcessSinks[0].Sample(ColorSinks_sampler, PSIn.UV);
}
else
{
PSOut.Color = ColorSinks[colorRT1].Sample(ColorSinks_sampler, PSIn.UV);
}
}
19 changes: 10 additions & 9 deletions resources/shaders/PPFxaa.psh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Texture2D ColorSinks[];
Texture2D DepthSinks[];
Texture2D PostProcessSinks[];
SamplerState ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix

cbuffer EnvironmentProperties
Expand All @@ -16,14 +17,14 @@ cbuffer EnvironmentProperties

cbuffer SinkIndices
{
uint colorRT1;
uint colorRT2;
uint colorRT3;
uint colorRT4;
uint depthRT1;
uint depthRT2;
uint depthRT3;
uint depthRT4;
int colorRT1;
int colorRT2;
int colorRT3;
int colorRT4;
int depthRT1;
int depthRT2;
int depthRT3;
uint hasPostProcess;
};

struct PSInput
Expand All @@ -50,7 +51,7 @@ void main(in PSInput PSIn, out PSOutput PSOut)
{
// Alias the resource names
SamplerState smplr = ColorSinks_sampler;
Texture2D colorTex = ColorSinks[colorRT1];
Texture2D colorTex = PostProcessSinks[0];
float4 sceneColor = colorTex.Sample(smplr, PSIn.UV);

// Get screen dimensions
Expand Down
16 changes: 8 additions & 8 deletions resources/shaders/PPOutline.psh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ cbuffer EnvironmentProperties

cbuffer SinkIndices
{
uint colorRT1;
uint colorRT2;
uint colorRT3;
uint colorRT4;
uint depthRT1;
uint depthRT2;
uint depthRT3;
uint depthRT4;
int colorRT1;
int colorRT2;
int colorRT3;
int colorRT4;
int depthRT1;
int depthRT2;
int depthRT3;
uint hasPostProcess;
};

cbuffer OutlinePassProperties
Expand Down
39 changes: 0 additions & 39 deletions resources/shaders/PPWave.psh
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions sample/source/scenes/PhysicsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,10 @@ auto BuildVehicle(ecs::Ecs world) -> Entity
const auto wheelBR = world.Emplace<Entity>({.position = brPosition, .scale = wheelScale, .parent = car, .tag = "BR"});
const auto carMesh = world.Emplace<Entity>({.scale = carScale, .parent = car, .tag = "CarMesh"});

world.Emplace<StaticMesh>(wheelFL, mesh::Wheel, material::Yellow);
world.Emplace<StaticMesh>(wheelFR, mesh::Wheel, material::Yellow);
world.Emplace<StaticMesh>(wheelBL, mesh::Wheel, material::Yellow);
world.Emplace<StaticMesh>(wheelBR, mesh::Wheel, material::Yellow);
world.Emplace<StaticMesh>(wheelFL, mesh::Wheel, material::Orange);
world.Emplace<StaticMesh>(wheelFR, mesh::Wheel, material::Orange);
world.Emplace<StaticMesh>(wheelBL, mesh::Wheel, material::Orange);
world.Emplace<StaticMesh>(wheelBR, mesh::Wheel, material::Orange);
world.Emplace<StaticMesh>(carMesh, mesh::Cube, material::Green);

CharacterEntities.push_back(car);
Expand Down
84 changes: 57 additions & 27 deletions source/ncengine/graphics2/NcGraphicsImpl2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,83 +166,94 @@ NcGraphicsImpl2::NcGraphicsImpl2(const config::GraphicsSettings& graphicsSetting
.name = "Depth",
.type = PassType::Material,
.shaderPaths = ShaderPaths{.vertexShaderPath = "Toon.vsh"},
.depthSink = MainDepth,
.isMsaa = false
.depthSink = DepthTarget::Main,
.isMsaa = false,
.useDepthTest = true
},
PassDesc{
.id = MaterialPassFlag::Depth,
.name = "Depth",
.type = PassType::SkinnedMaterial,
.shaderPaths = ShaderPaths{.vertexShaderPath = "ToonSkinned.vsh"},
.depthSink = MainDepth,
.isMsaa = false
.depthSink = DepthTarget::Main,
.isMsaa = false,
.useDepthTest = true
},
PassDesc{
.id = MaterialPassFlag::Toon,
.name = "Toon",
.type = PassType::Material,
.shaderPaths = ShaderPaths{"Toon.psh", "Toon.vsh"},
.colorSink = MainColorMsaa,
.depthSink = MainDepthMsaa
.colorSink = ColorTarget::Main,
.depthSink = DepthTarget::Main,
.useDepthTest = true

},
PassDesc{
.id = MaterialPassFlag::Toon,
.name = "ToonSkinned",
.type = PassType::SkinnedMaterial,
.shaderPaths = ShaderPaths{"Toon.psh", "ToonSkinned.vsh"},
.colorSink = MainColorMsaa,
.depthSink = MainDepthMsaa
.colorSink = ColorTarget::Main,
.depthSink = DepthTarget::Main,
.useDepthTest = true
},
PassDesc{
.id = MaterialPassFlag::Normals,
.name = "Normals",
.type = PassType::Material,
.shaderPaths = ShaderPaths{"Normals.psh", "Toon.vsh"},
.colorSink = NormalsColorMsaa,
.depthSink = MainDepthMsaa
.colorSink = ColorTarget::Normals,
.depthSink = DepthTarget::Main,
.useDepthTest = true
},
PassDesc{
.id = MaterialPassFlag::Normals,
.name = "NormalsSkinned",
.type = PassType::SkinnedMaterial,
.shaderPaths = ShaderPaths{"Normals.psh", "ToonSkinned.vsh"},
.colorSink = NormalsColorMsaa,
.depthSink = MainDepthMsaa
.colorSink = ColorTarget::Normals,
.depthSink = DepthTarget::Main,
.useDepthTest = true
},
PassDesc{
.id = MiscPassFlag::Wireframe,
.name = "Wireframe",
.type = PassType::Wireframe,
.shaderPaths = ShaderPaths{"Wireframe.psh", "Wireframe.vsh"},
.colorSink = MainColorMsaa,
.depthSink = MainDepthMsaa
.colorSink = ColorTarget::Main,
.depthSink = DepthTarget::Main,
.useDepthTest = true
},
PassDesc{
.id = MiscPassFlag::Particle,
.name = "Particle",
.type = PassType::Particle,
.shaderPaths = ShaderPaths{"Particle.psh", "Particle.vsh"},
.colorSink = MainColor,
.depthSink = MainDepth
.colorSink = ColorTarget::Main,
.depthSink = DepthTarget::Main,
.useDepthTest = true
},
PassDesc{
.id = PostProcessPassFlag::Outline,
.name = "Post Process Outline",
.type = PassType::PostProcess,
.shaderPaths = ShaderPaths{"PPOutline.psh", "PostProcess.vsh"},
.colorSources = std::vector{MainColor, NormalsColor},
.depthSources = SingleSource(MainDepth),
.colorSink = PPOutlineColor,
.isMsaa = false
.colorSources = std::vector{ColorTarget::Main, ColorTarget::Normals},
.depthSources = std::vector{DepthTarget::Main},
.postProcessSink = PostProcessTarget::PPOutline,
.isMsaa = false,
.useDepthTest = false
},
PassDesc{
.id = PostProcessPassFlag::Fxaa,
.name = "Post Process FXAA",
.type = PassType::PostProcess,
.shaderPaths = ShaderPaths{"PPFxaa.psh", "PostProcess.vsh"},
.colorSources = std::vector{PPOutlineColor},
.colorSink = PPFxaaColor,
.isMsaa = false
.postProcessSource = PostProcessTarget::PPOutline,
.postProcessSink = PostProcessTarget::PPFxaa,
.isMsaa = false,
.useDepthTest = false
}
},
GetImplementedMaterialPassFlags(),
Expand All @@ -251,6 +262,7 @@ NcGraphicsImpl2::NcGraphicsImpl2(const config::GraphicsSettings& graphicsSetting
},
m_passBackend{
m_engine.GetDevice(),
m_engine.GetContext(),
m_engine.GetSwapChain(),
m_engine.GetShaderFactory(),
m_shaderBindings,
Expand All @@ -277,7 +289,8 @@ NcGraphicsImpl2::NcGraphicsImpl2(const config::GraphicsSettings& graphicsSetting
},
m_onResizeConnection{window.OnResize().Connect(this, &NcGraphicsImpl2::OnResize)},
m_resizeNeeded{false},
m_numSamples{m_engine.GetDeviceCapability().msaaSampleCount}
m_numSamples{m_engine.GetDeviceCapability().msaaSampleCount},
m_isMinimized{false}
{
}

Expand Down Expand Up @@ -385,6 +398,11 @@ void NcGraphicsImpl2::Run()
Resize();
}

if (m_isMinimized)
{
return;
}

auto& context = m_engine.GetContext();
auto& device = m_engine.GetDevice();
auto& swapChain = m_engine.GetSwapChain();
Expand Down Expand Up @@ -429,6 +447,12 @@ void NcGraphicsImpl2::Run()
m_shaderBindings.GetPerFrameSignature()
);

m_passBackend.RenderOutputToSwapchain(
context,
swapChain,
m_shaderBindings.GetPerPassSignature()
);

m_ui.Render(context);

swapChain.Present();
Expand All @@ -438,7 +462,13 @@ void NcGraphicsImpl2::Run()

void NcGraphicsImpl2::OnResize(const Vector2& dimensions, bool isMinimized)
{
if (isMinimized) return;
if (isMinimized)
{
m_isMinimized = true;
return;
}

m_isMinimized = false;
m_engine.GetSwapChain().Resize(static_cast<uint32_t>(dimensions.x), static_cast<uint32_t>(dimensions.y));
m_resizeNeeded = true;
m_dimensions = dimensions;
Expand All @@ -449,8 +479,8 @@ void NcGraphicsImpl2::Resize()
const auto width = static_cast<uint32_t>(m_dimensions.x);
const auto height = static_cast<uint32_t>(m_dimensions.y);
m_engine.GetSwapChain().Resize(width, height);
m_shaderBindings.GetPerPassSignature().GetColorSinkBufferResource().Resize(m_engine.GetDevice(), width, height, m_numSamples);
m_shaderBindings.GetPerPassSignature().GetDepthSinkBufferResource().Resize(m_engine.GetDevice(), width, height, m_numSamples);
m_shaderBindings.GetPerPassSignature().GetColorSinksResource().Resize(m_engine.GetDevice(), m_engine.GetContext(), width, height, m_numSamples);
m_shaderBindings.GetPerPassSignature().GetDepthSinksResource().Resize(m_engine.GetDevice(), m_engine.GetContext(), width, height, m_numSamples);
m_resizeNeeded = false;
}
} // namespace graphics
Expand Down
1 change: 1 addition & 0 deletions source/ncengine/graphics2/NcGraphicsImpl2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class NcGraphicsImpl2 : public NcGraphics
Vector2 m_dimensions;
bool m_resizeNeeded;
uint32_t m_numSamples;
bool m_isMinimized;
};
} // namespace graphics
} // namespace nc
16 changes: 8 additions & 8 deletions source/ncengine/graphics2/ShaderTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ struct OutlinePassData
// Object model for specifying the index into the color and depth offscreen render target arrays. Limited to four of each type of index
struct PostProcessSinkIndexData
{
uint32_t colorRenderTargetIndex1;
uint32_t colorRenderTargetIndex2;
uint32_t colorRenderTargetIndex3;
uint32_t colorRenderTargetIndex4;
uint32_t depthRenderTargetIndex1;
uint32_t depthRenderTargetIndex2;
uint32_t depthRenderTargetIndex3;
uint32_t depthRenderTargetIndex4;
int32_t colorRenderTargetIndex1;
int32_t colorRenderTargetIndex2;
int32_t colorRenderTargetIndex3;
int32_t colorRenderTargetIndex4;
int32_t depthRenderTargetIndex1;
int32_t depthRenderTargetIndex2;
int32_t depthRenderTargetIndex3;
uint32_t hasPostProcessTarget;
};

// Object model for StaticMeshes (type: StructuredBuffer element type).
Expand Down
1 change: 1 addition & 0 deletions source/ncengine/graphics2/diligent/pass/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ target_sources(${NC_ENGINE_LIB}
PRIVATE
MaterialPass.cpp
ParticlePass.cpp
Pass.cpp
PassBackend.cpp
PassManifest.cpp
PassUtilities.cpp
Expand Down
Loading