Skip to content

Commit 9cfedb9

Browse files
committed
address build problems with gnu compiler
Signed-off-by: Michael Pollind <mpollind@gmail.com>
1 parent f4a8ab0 commit 9cfedb9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/nbl/asset/IAssetManager.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,38 +239,38 @@ void IAssetManager::insertBuiltinAssets()
239239
};
240240
auto fileSystem = getSystem();
241241

242-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/specialized_shader/fullscreentriangle.vert")>(),
242+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/specialized_shader/fullscreentriangle.vert")>(),
243243
asset::IShader::ESS_VERTEX,
244244
{
245245
"nbl/builtin/specialized_shader/fullscreentriangle.vert"
246246
});
247-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert")>(),
247+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert")>(),
248248
asset::IShader::ESS_VERTEX,
249249
{
250250
"nbl/builtin/material/lambertian/singletexture/specialized_shader.vert",
251251
"nbl/builtin/material/debug/vertex_uv/specialized_shader.vert"
252252
});
253-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.frag")>(), // it somehow adds an extra "tt" raw string to the end of the returned value, beware
253+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.frag")>(), // it somehow adds an extra "tt" raw string to the end of the returned value, beware
254254
asset::IShader::ESS_FRAGMENT,
255255
{
256256
"nbl/builtin/material/lambertian/singletexture/specialized_shader.frag"
257257
});
258258

259-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert")>(),
259+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert")>(),
260260
asset::IShader::ESS_VERTEX,
261261
{
262262
"nbl/builtin/material/debug/vertex_normal/specialized_shader.vert"});
263-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_color/specialized_shader.vert")>(),
263+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_color/specialized_shader.vert")>(),
264264
asset::IShader::ESS_VERTEX,
265265
{
266266
"nbl/builtin/material/debug/vertex_color/specialized_shader.vert"
267267
});
268-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_uv/specialized_shader.frag")>(),
268+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_uv/specialized_shader.frag")>(),
269269
asset::IShader::ESS_FRAGMENT,
270270
{
271271
"nbl/builtin/material/debug/vertex_uv/specialized_shader.frag"
272272
});
273-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.frag")>(),
273+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.frag")>(),
274274
asset::IShader::ESS_FRAGMENT,
275275
{
276276
"nbl/builtin/material/debug/vertex_normal/specialized_shader.frag",

src/nbl/video/utilities/CPropertyPoolHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CPropertyPoolHandler::CPropertyPoolHandler(core::smart_refctd_ptr<ILogicalDevice
1515
auto system = m_device->getPhysicalDevice()->getSystem();
1616
core::smart_refctd_ptr<asset::ICPUBuffer> glsl;
1717
{
18-
auto glslFile = system->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/property_pool/copy.comp")>();
18+
auto glslFile = system->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/property_pool/copy.comp")>();
1919
glsl = core::make_smart_refctd_ptr<asset::ICPUBuffer>(glslFile->getSize());
2020
memcpy(glsl->getPointer(), glslFile->getMappedPointer(), glsl->getSize());
2121
}

src/nbl/video/utilities/CScanner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ core::smart_refctd_ptr<asset::ICPUShader> CScanner::createShader(const bool indi
99
core::smart_refctd_ptr<const system::IFile> glsl;
1010
{
1111
if(indirect)
12-
glsl = system->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/scan/indirect.comp")>();
12+
glsl = system->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/scan/indirect.comp")>();
1313
else
14-
glsl = system->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/scan/direct.comp")>();
14+
glsl = system->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/scan/direct.comp")>();
1515
}
1616
auto buffer = core::make_smart_refctd_ptr<asset::ICPUBuffer>(glsl->getSize());
1717
memcpy(buffer->getPointer(), glsl->getMappedPointer(), glsl->getSize());

0 commit comments

Comments
 (0)