Skip to content

Commit 94dbca2

Browse files
fix weird build issues
1 parent ebe1b01 commit 94dbca2

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

3rdparty/tcpp

include/nbl/asset/IDescriptorSetLayout.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Copyright (C) 2018-2020 - 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+
#ifndef _NBL_ASSET_I_DESCRIPTOR_SET_LAYOUT_H_INCLUDED_
5+
#define _NBL_ASSET_I_DESCRIPTOR_SET_LAYOUT_H_INCLUDED_
46

5-
#ifndef __NBL_ASSET_I_DESCRIPTOR_SET_LAYOUT_H_INCLUDED__
6-
#define __NBL_ASSET_I_DESCRIPTOR_SET_LAYOUT_H_INCLUDED__
77

88
#include "nbl/core/declarations.h"
99
#include "nbl/core/SRange.h"
10+
1011
#include "nbl/asset/ISpecializedShader.h"
1112
#include "nbl/asset/IShader.h"
1213

13-
namespace nbl
14-
{
15-
namespace asset
14+
15+
namespace nbl::asset
1616
{
1717

1818
//! Interface class for Descriptor Set Layouts
@@ -395,6 +395,4 @@ class IDescriptorSetLayout : public virtual core::IReferenceCounted
395395
};
396396

397397
}
398-
}
399-
400398
#endif

include/nbl/video/IDescriptorPool.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __NBL_I_DESCRIPTOR_POOL_H_INCLUDED__
2-
#define __NBL_I_DESCRIPTOR_POOL_H_INCLUDED__
1+
#ifndef _NBL_I_DESCRIPTOR_POOL_H_INCLUDED_
2+
#define _NBL_I_DESCRIPTOR_POOL_H_INCLUDED_
33

44

55
#include "nbl/core/IReferenceCounted.h"
@@ -13,9 +13,11 @@
1313
namespace nbl::video
1414
{
1515

16+
class IGPUBuffer;
17+
class IGPUBufferView;
1618
class IGPUImageView;
1719
class IGPUSampler;
18-
class IGPUBufferView;
20+
class IGPUAccelerationStructure;
1921
class IGPUDescriptorSet;
2022
class IGPUDescriptorSetLayout;
2123

src/nbl/asset/utils/CHLSLCompiler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <sstream>
1616
#include <regex>
1717
#include <iterator>
18+
#include <codecvt>
1819

1920
#define TCPP_IMPLEMENTATION
2021
#include <tcpp/source/tcppLibrary.hpp>

0 commit comments

Comments
 (0)