fixes

Author: Przemog1

source/Irrlicht/COpenGLDriver.cpp

@@ -52,10 +52,10 @@ class AMDbugfixCompiler : public spirv_cross::Compiler
 public:
     using spirv_cross::Compiler::Compiler;
 
-    _IRR_STATIC_INLINE_CONSTEXPR bool ACCOUNT_SSBO = true;
+    _NBL_STATIC_INLINE_CONSTEXPR bool ACCOUNT_SSBO = true;
 
     // {numer of possible row counts} * {number of possible col counts} * {number of possible basetypes (float/double)}
-    _IRR_STATIC_INLINE_CONSTEXPR uint32_t WORKAROUND_FUNCTION_COUNT = 3u*3u*2u;
+    _NBL_STATIC_INLINE_CONSTEXPR uint32_t WORKAROUND_FUNCTION_COUNT = 3u*3u*2u;
     struct SFunction
     {
         uint32_t restype;

src/irr/CMakeLists.txt

@@ -205,32 +205,20 @@ set(NBL_ASSET_SOURCES
 )
 set(NBL_VIDEO_SOURCES
 # Allocators
-<<<<<<< HEAD
 	${NBL_ROOT_PATH}/src/irr/video/alloc/GPUMemoryAllocatorBase.cpp
 	${NBL_ROOT_PATH}/src/irr/video/alloc/SimpleGPUBufferAllocator.cpp
-
-# Junk to refactor
-${NBL_ROOT_PATH}/source/Irrlicht/IDriver.cpp
-${NBL_ROOT_PATH}/source/Irrlicht/CNullDriver.cpp
-	${NBL_ROOT_PATH}/src/irr/video/COpenGLSpecializedShader.cpp
-	${NBL_ROOT_PATH}/source/Irrlicht/FW_Mutex.cpp
-	${NBL_ROOT_PATH}/source/Irrlicht/CFPSCounter.cpp
-=======
-	${IRR_ROOT_PATH}/src/irr/video/alloc/GPUMemoryAllocatorBase.cpp
-	${IRR_ROOT_PATH}/src/irr/video/alloc/SimpleGPUBufferAllocator.cpp
 
 # Shaders
-	${IRR_ROOT_PATH}/src/irr/video/COpenGLSpecializedShader.cpp
+	${NBL_ROOT_PATH}/src/irr/video/COpenGLSpecializedShader.cpp
 
 # Property Pools
-	${IRR_ROOT_PATH}/src/irr/video/CPropertyPoolHandler.cpp
+	${NBL_ROOT_PATH}/src/irr/video/CPropertyPoolHandler.cpp
 
 # Junk to refactor
-${IRR_ROOT_PATH}/source/Irrlicht/IDriver.cpp
-${IRR_ROOT_PATH}/source/Irrlicht/CNullDriver.cpp
-	${IRR_ROOT_PATH}/source/Irrlicht/FW_Mutex.cpp
-	${IRR_ROOT_PATH}/source/Irrlicht/CFPSCounter.cpp
->>>>>>> 161124a675076a453cebd61216dbc4a713b49049
+${NBL_ROOT_PATH}/source/Irrlicht/IDriver.cpp
+${NBL_ROOT_PATH}/source/Irrlicht/CNullDriver.cpp
+	${NBL_ROOT_PATH}/source/Irrlicht/FW_Mutex.cpp
+	${NBL_ROOT_PATH}/source/Irrlicht/CFPSCounter.cpp
 )
 set(NBL_SCENE_SOURCES
 # Junk to refactor

src/irr/ext/MitsubaLoader/CMakeLists.txt

@@ -1,31 +1,31 @@
-include(${IRR_ROOT_PATH}/cmake/common.cmake)
-
-set(IRR_EXT_INTERNAL_INCLUDE_DIR "${IRR_ROOT_PATH}/include/irr/ext/MitsubaLoader")
-
-
-set(IRR_EXT_MITSUBA_LOADER_H
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/PropertyElement.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/IElement.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaMetadata.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementIntegrator.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementSensor.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementFilm.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementRFilter.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementSampler.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementTransform.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementShape.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementBSDF.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementTexture.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementEmitter.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CElementFactory.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CGlobalMitsubaMetadata.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/ParserUtil.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CSerializedLoader.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaLoader.h
-	${IRR_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaMaterialCompilerFrontend.h
+include(${NBL_ROOT_PATH}/cmake/common.cmake)
+
+set(NBL_EXT_INTERNAL_INCLUDE_DIR "${NBL_ROOT_PATH}/include/irr/ext/MitsubaLoader")
+
+
+set(NBL_EXT_MITSUBA_LOADER_H
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/PropertyElement.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/IElement.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaMetadata.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementIntegrator.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementSensor.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementFilm.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementRFilter.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementSampler.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementTransform.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementShape.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementBSDF.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementTexture.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementEmitter.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CElementFactory.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CGlobalMitsubaMetadata.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/ParserUtil.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CSerializedLoader.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaLoader.h
+	${NBL_EXT_INTERNAL_INCLUDE_DIR}/CMitsubaMaterialCompilerFrontend.h
 )
 
-set(IRR_EXT_MITSUBA_LOADER_SRC
+set(NBL_EXT_MITSUBA_LOADER_SRC
 	PropertyElement.cpp
 	CElementIntegrator.cpp
 	CElementSensor.cpp
@@ -44,16 +44,16 @@ set(IRR_EXT_MITSUBA_LOADER_SRC
 	CMitsubaMaterialCompilerFrontend.cpp
 )
 
-set(IRR_EXT_MITSUBA_LOADER_EXTERNAL_INCLUDE
-	"${IRR_ROOT_PATH}/3rdparty"
-	"${IRR_ROOT_PATH}/3rdparty/libexpat"
+set(NBL_EXT_MITSUBA_LOADER_EXTERNAL_INCLUDE
+	"${NBL_ROOT_PATH}/3rdparty"
+	"${NBL_ROOT_PATH}/3rdparty/libexpat"
 )
 
 irr_create_ext_library_project(
 	MITSUBA_LOADER
-	"${IRR_EXT_MITSUBA_LOADER_H}"
-	"${IRR_EXT_MITSUBA_LOADER_SRC}"
-	"${IRR_EXT_MITSUBA_LOADER_EXTERNAL_INCLUDE}"
+	"${NBL_EXT_MITSUBA_LOADER_H}"
+	"${NBL_EXT_MITSUBA_LOADER_SRC}"
+	"${NBL_EXT_MITSUBA_LOADER_EXTERNAL_INCLUDE}"
 	""
 )