Skip to content

Commit b461db6

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

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
@@ -242,38 +242,38 @@ void IAssetManager::insertBuiltinAssets()
242242
};
243243
auto fileSystem = getSystem();
244244

245-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/specialized_shader/fullscreentriangle.vert")>(),
245+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/specialized_shader/fullscreentriangle.vert")>(),
246246
asset::IShader::ESS_VERTEX,
247247
{
248248
"nbl/builtin/specialized_shader/fullscreentriangle.vert"
249249
});
250-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert")>(),
250+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert")>(),
251251
asset::IShader::ESS_VERTEX,
252252
{
253253
"nbl/builtin/material/lambertian/singletexture/specialized_shader.vert",
254254
"nbl/builtin/material/debug/vertex_uv/specialized_shader.vert"
255255
});
256-
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
256+
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
257257
asset::IShader::ESS_FRAGMENT,
258258
{
259259
"nbl/builtin/material/lambertian/singletexture/specialized_shader.frag"
260260
});
261261

262-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert")>(),
262+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert")>(),
263263
asset::IShader::ESS_VERTEX,
264264
{
265265
"nbl/builtin/material/debug/vertex_normal/specialized_shader.vert"});
266-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_color/specialized_shader.vert")>(),
266+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_color/specialized_shader.vert")>(),
267267
asset::IShader::ESS_VERTEX,
268268
{
269269
"nbl/builtin/material/debug/vertex_color/specialized_shader.vert"
270270
});
271-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_uv/specialized_shader.frag")>(),
271+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_uv/specialized_shader.frag")>(),
272272
asset::IShader::ESS_FRAGMENT,
273273
{
274274
"nbl/builtin/material/debug/vertex_uv/specialized_shader.frag"
275275
});
276-
buildInGLSLShader(fileSystem->loadBuiltinData<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.frag")>(),
276+
buildInGLSLShader(fileSystem->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/material/debug/vertex_normal/specialized_shader.frag")>(),
277277
asset::IShader::ESS_FRAGMENT,
278278
{
279279
"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)