Skip to content

Commit e1a87e7

Browse files
author
devsh
committed
stupid typos are the bane of my existence
1 parent ea429a8 commit e1a87e7

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

examples_tests

include/nbl/asset/IPipelineLayout.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class IPipelineLayout
183183
if (!found)
184184
return "#error \"Could not find `IPipelineLayout::SBindingKey::binding::binding` in `IPipelineLayout::SBindingKey::binding::set`'s layout!\"";
185185
}
186-
if (redirect->getStageFlags(found).hasFlags(key.requiredStages))
186+
if (!redirect->getStageFlags(found).hasFlags(key.requiredStages))
187187
return "#error \"Binding found in the layout doesn't have all the `IPipelineLayout::SBindingKey::binding::requiredStages` flags!\"";
188188
const auto count = redirect->getCount(found);
189189
assert(count); // this layout should have never passed validation

include/nbl/builtin/hlsl/blit/common.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace hlsl
1212
{
1313
namespace glsl
1414
{
15-
uint32_t gl_WorkGroupSize()
15+
uint32_t3 gl_WorkGroupSize()
1616
{
1717
return uint32_t3(ConstevalParameters::WorkGroupSize,1,1);
1818
}

include/nbl/builtin/hlsl/blit/default_blit.comp.hlsl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Copyright (C) 2023-2024 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4-
//#include "nbl/builtin/hlsl/blit/common.hlsl"
5-
//#include "nbl/builtin/hlsl/blit/parameters.hlsl"
6-
//#include "nbl/builtin/hlsl/blit/compute_blit.hlsl"
4+
#include "nbl/builtin/hlsl/blit/parameters.hlsl"
75

6+
#include "nbl/builtin/hlsl/blit/common.hlsl"
7+
//#include "nbl/builtin/hlsl/blit/compute_blit.hlsl"
88

9-
groupshared uint32_t sMem[ConstevalParameters::SharedMemoryDWORDs];
109
/*
1110
struct HistogramAccessor
1211
{

include/nbl/builtin/hlsl/blit/default_normalize.comp.hlsl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// Copyright (C) 2023-2024 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4-
#include "nbl/builtin/hlsl/blit/common.hlsl"
5-
4+
#include "nbl/builtin/hlsl/blit/parameters.hlsl"
65

7-
8-
//#include "nbl/builtin/hlsl/blit/parameters.hlsl"
6+
#include "nbl/builtin/hlsl/blit/common.hlsl"
97
//#include "nbl/builtin/hlsl/blit/compute_blit.hlsl"
108

119
using namespace nbl::hlsl::blit;

src/nbl/video/utilities/CComputeBlit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ using kernel_weight_binding_t = )===" << layout->getBindingInfoForHLSL({.binding
5555
using input_sampler_binding_t = )===" << layout->getBindingInfoForHLSL({.binding=info.samplers,.requiredStages=IShader::E_SHADER_STAGE::ESS_COMPUTE}) << R"===(;
5656
using input_image_binding_t = )===" << layout->getBindingInfoForHLSL({.binding=info.inputs,.requiredStages=IShader::E_SHADER_STAGE::ESS_COMPUTE}) << R"===(;
5757
using output_binding_t = )===" << layout->getBindingInfoForHLSL({.binding=info.outputs,.requiredStages=IShader::E_SHADER_STAGE::ESS_COMPUTE}) << R"===(;
58-
NBL_CONSTEXPR_STATIC_INLINE uint32_t uint32_t SharedMemoryDWORDs = )===" << (sharedMemoryPerInvocation* retval.workgroupSize)/sizeof(uint32_t) << R"===(;
58+
NBL_CONSTEXPR_STATIC_INLINE uint32_t SharedMemoryDWORDs = )===" << (sharedMemoryPerInvocation* retval.workgroupSize)/sizeof(uint32_t) << R"===(;
5959
};
6060
)===";
6161
return tmp.str();

0 commit comments

Comments
 (0)