Skip to content

Commit 992fa5c

Browse files
start to port FSTri
1 parent 9ab9a10 commit 992fa5c

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

include/nbl/ext/FullScreenTriangle/FullScreenTriangle.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
1+
// Copyright (C) 2018-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-
54
#ifndef _NBL_EXT_FULL_SCREEN_TRIANGLE_FULL_SCREEN_TRIANGLE_INCLUDED_
65
#define _NBL_EXT_FULL_SCREEN_TRIANGLE_FULL_SCREEN_TRIANGLE_INCLUDED_
76

87
#include "nabla.h"
98

10-
namespace nbl
9+
namespace nbl::ext::FullScreenTriangle
1110
{
12-
namespace ext
13-
{
14-
namespace FullScreenTriangle
15-
{
16-
using NBL_PROTO_PIPELINE = std::tuple<core::smart_refctd_ptr<video::IGPUSpecializedShader>, asset::SVertexInputParams, asset::SPrimitiveAssemblyParams, asset::SBlendParams, nbl::asset::SRasterizationParams, asset::SPushConstantRange>;
1711

18-
inline NBL_PROTO_PIPELINE createProtoPipeline(video::IGPUObjectFromAssetConverter::SParams& cpu2gpuParams, uint32_t pushConstantOffset)
12+
#if 0
13+
inline NBL_PROTO_PIPELINE createProtoPipeline(, uint32_t pushConstantOffset)
1914
{
2015
if (!cpu2gpuParams.assetManager)
2116
assert(false);
@@ -117,9 +112,6 @@ namespace nbl
117112

118113
return commandBuffer->draw(VERTEX_COUNT, INSTANCE_COUNT, 0, 0);
119114
}
120-
}
121-
}
122-
}
123-
124115
#endif
125-
116+
}
117+
#endif

include/nbl/video/utilities/ISimpleManagedSurface.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include "nbl/video/ISwapchain.h"
66
#include "nbl/video/ILogicalDevice.h"
77

8+
#include "nbl/video/CVulkanSwapchain.h"
9+
810

911
namespace nbl::video
1012
{

0 commit comments

Comments
 (0)