Update glslang
Fix code paths in getShaderValue implementations that did not return a value
This commit is contained in:
2
3rdparty/glslang
vendored
2
3rdparty/glslang
vendored
Submodule 3rdparty/glslang updated: 8243ca3c30...8a85691a07
@@ -68,6 +68,7 @@ bool KRModelView::getShaderValue(ShaderValue value, Vector3* output) const
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool KRModelView::getShaderValue(ShaderValue value, Matrix4* output) const
|
||||
{
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "KRRenderPass.h"
|
||||
#include "KRSurface.h"
|
||||
#include "KRDevice.h"
|
||||
#include <array>
|
||||
|
||||
KRRenderGraph::KRRenderGraph(KRContext& context)
|
||||
: KRContextObject(context)
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "KRRenderPass.h"
|
||||
#include "KRSurface.h"
|
||||
#include "KRSwapchain.h"
|
||||
#include <array>
|
||||
|
||||
using namespace hydra;
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
#include "KRSwapchain.h"
|
||||
#include "KRRenderPass.h"
|
||||
|
||||
#include <array>
|
||||
|
||||
KRSwapchain::KRSwapchain(KRContext& context)
|
||||
: KRContextObject(context)
|
||||
, m_swapChain(VK_NULL_HANDLE)
|
||||
|
||||
@@ -59,24 +59,19 @@ bool KRViewport::getShaderValue(ShaderValue value, Matrix4* output) const
|
||||
{
|
||||
switch (value) {
|
||||
case ShaderValue::projection_matrix:
|
||||
{
|
||||
*output = m_matProjection;
|
||||
return true;
|
||||
}
|
||||
case ShaderValue::invp:
|
||||
{
|
||||
*output = m_matInverseProjection;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
|
||||
{
|
||||
switch (value) {
|
||||
case ShaderValue::viewport:
|
||||
{
|
||||
*output = Vector4::Create(
|
||||
0.0f,
|
||||
0.0f,
|
||||
@@ -85,7 +80,6 @@ bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
|
||||
);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user