Skip to content

Commit c02f4c4

Browse files
Merge branch 'tcpp-remove' of github.com:Devsh-Graphics-Programming/Nabla
2 parents ea96ae6 + 12afd3d commit c02f4c4

File tree

6 files changed

+825
-196
lines changed

6 files changed

+825
-196
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@
7878
path = 3rdparty/dxc/dxc
7979
url = git@github.com:Devsh-Graphics-Programming/DirectXShaderCompiler.git
8080
branch = devshFixes
81-
[submodule "3rdparty/tcpp"]
82-
path = 3rdparty/tcpp
83-
url = git@github.com:Erfan-Ahmadi/tcpp.git
8481
[submodule "3rdparty/imgui"]
8582
path = 3rdparty/imgui
8683
url = git@github.com:Devsh-Graphics-Programming/imgui.git

3rdparty/tcpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

include/nbl/asset/utils/CHLSLCompiler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#ifdef _NBL_PLATFORM_WINDOWS_
1212

13-
namespace nbl::asset::hlsl::impl
13+
namespace nbl::asset::impl
1414
{
1515
class DXC;
1616
}
@@ -53,7 +53,7 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
5353

5454
// This can't be a unique_ptr due to it being an undefined type
5555
// when Nabla is used as a lib
56-
nbl::asset::hlsl::impl::DXC* m_dxcCompilerTypes;
56+
nbl::asset::impl::DXC* m_dxcCompilerTypes;
5757

5858
static CHLSLCompiler::SOptions option_cast(const IShaderCompiler::SCompilerOptions& options)
5959
{

include/nbl/video/ILogicalDevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
572572
const ptrdiff_t pos = pool.tellp();
573573
m_extraShaderDefines.push_back(reinterpret_cast<const char*>(pos));
574574
pool << define << " ";
575-
((pool << std::forward<Args>(args)), ...);
575+
((pool << (std::is_same<uint8_t, Args>::value ? static_cast<uint32_t>(std::forward<Args>(args)) : std::forward<Args>(args))), ...);
576576
}
577577
inline void finalizeShaderDefinePool(std::ostringstream&& pool)
578578
{

0 commit comments

Comments
 (0)