Update glslang

Fix code paths in getShaderValue implementations that did not return a value
This commit is contained in:
2025-08-31 14:51:45 -07:00
parent 1bd16c05c0
commit f48d99d2c2
6 changed files with 12 additions and 13 deletions

View File

@@ -68,6 +68,7 @@ bool KRModelView::getShaderValue(ShaderValue value, Vector3* output) const
return true; return true;
} }
} }
return false;
} }
bool KRModelView::getShaderValue(ShaderValue value, Matrix4* output) const bool KRModelView::getShaderValue(ShaderValue value, Matrix4* output) const
{ {

View File

@@ -33,6 +33,7 @@
#include "KRRenderPass.h" #include "KRRenderPass.h"
#include "KRSurface.h" #include "KRSurface.h"
#include "KRDevice.h" #include "KRDevice.h"
#include <array>
KRRenderGraph::KRRenderGraph(KRContext& context) KRRenderGraph::KRRenderGraph(KRContext& context)
: KRContextObject(context) : KRContextObject(context)

View File

@@ -32,6 +32,7 @@
#include "KRRenderPass.h" #include "KRRenderPass.h"
#include "KRSurface.h" #include "KRSurface.h"
#include "KRSwapchain.h" #include "KRSwapchain.h"
#include <array>
using namespace hydra; using namespace hydra;

View File

@@ -32,6 +32,8 @@
#include "KRSwapchain.h" #include "KRSwapchain.h"
#include "KRRenderPass.h" #include "KRRenderPass.h"
#include <array>
KRSwapchain::KRSwapchain(KRContext& context) KRSwapchain::KRSwapchain(KRContext& context)
: KRContextObject(context) : KRContextObject(context)
, m_swapChain(VK_NULL_HANDLE) , m_swapChain(VK_NULL_HANDLE)

View File

@@ -59,24 +59,19 @@ bool KRViewport::getShaderValue(ShaderValue value, Matrix4* output) const
{ {
switch (value) { switch (value) {
case ShaderValue::projection_matrix: case ShaderValue::projection_matrix:
{
*output = m_matProjection; *output = m_matProjection;
return true; return true;
}
case ShaderValue::invp: case ShaderValue::invp:
{
*output = m_matInverseProjection; *output = m_matInverseProjection;
return true; return true;
} }
return false; return false;
} }
}
bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
{ {
switch (value) { switch (value) {
case ShaderValue::viewport: case ShaderValue::viewport:
{
*output = Vector4::Create( *output = Vector4::Create(
0.0f, 0.0f,
0.0f, 0.0f,
@@ -85,7 +80,6 @@ bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
); );
return true; return true;
} }
}
return false; return false;
} }