MacOS #488

AnastaZIuk · 2023-04-23T17:03:26Z

No description provided.

… set CMP0042 policy to NEW (MACOSX_RPATH) and correct top CMakeLists file to not throw warning of unknown compiler - make CMake generate with Sublime Text 2 Ninja generator

…CMAKE_HOST_SYSTEM_PROCESSOR

…on MacOS ARM builds - fix building of zlibstatic and aesGladman targets

…amming/Nabla into MacOSX

…rated header into declaration of an explicit template specialization, get rid of AppleClang compile errors on builtin resource targets

…uilds (missing bessel special functions implementation in shipped libc++ by Xcode), update CMakeLists with clang build corrections, add missing typename keywords and fix some compile errors)

…dation of CMake generator toolset

… AppleClang. Temporary disable installation of tbb targets - TODO. Fix Nabla execution header related errors. Update CMake files. Make a SBuildInfo struct MoveInsertable and eliminate emplate_back errors

…loc_proxy target

…operators to nbl::system::ISystem::SRequestType because of std::variant type-safe union defined as a member and elimiante some of compile errors

…acOS defines, update CMake files

…Xcode generator

devshgraphicsprogramming · 2023-04-30T20:02:56Z

3rdparty/CMakeLists.txt

+# MacOS patches
+if(APPLE)
+    set(_NBL_MACOS_PATCH_INCLUDE_ "${CMAKE_CURRENT_BINARY_DIR}/macos/include" CACHE INTERNAL "")
+
+    set(_NBL_MACOS_BYTESWAP_H_
+"#if defined(__APPLE__)\n\
+// Mac OS X / Darwin features\n\
+#include <libkern/OSByteOrder.h>\n\n\
+#define bswap_16(x) OSSwapInt16(x)\n\
+#define bswap_32(x) OSSwapInt32(x)\n\
+#define bswap_64(x) OSSwapInt64(x)\n\
+#endif // __APPLE__"
+    )
+
+    set(_NBL_MACOS_ENDIAN_H_
+"#if defined(__APPLE__)\n\
+#include <machine/endian.h>\n\
+#endif // __APPLE__"
+    )
+
+    file(WRITE "${_NBL_MACOS_PATCH_INCLUDE_}/byteswap.h" "${_NBL_MACOS_BYTESWAP_H_}")
+    file(WRITE "${_NBL_MACOS_PATCH_INCLUDE_}/endian.h" "${_NBL_MACOS_ENDIAN_H_}")
+
+    include_directories(BEFORE SYSTEM "${_NBL_MACOS_PATCH_INCLUDE_}")
+endif()


both ARM and x86 are little-endian

we're not going to support PowerPC cause its freaking ancient

what dependency even needs this?

devshgraphicsprogramming · 2023-04-30T20:56:13Z

CMakeLists.txt

+
+            -msse4.2
+            -mfpmath=sse
+            $<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,C>:-maes>


what do we need AES for?

devshgraphicsprogramming · 2023-04-30T20:56:32Z

CMakeLists.txt

+
+    if("${CMAKE_GENERATOR}" STREQUAL "Xcode")
+        if(NOT "${CMAKE_GENERATOR_TOOLSET}" STREQUAL "buildsystem=1")
+            message("Nabla build isn't supported with new Xcode buildsystem, you must specify CMake generator toolset as '-T buildsystem=1' in order to use legacy Xcode build system")


whats the new Xcode buildsystem?

devshgraphicsprogramming · 2023-04-30T20:58:02Z

include/nbl/asset/IDescriptorSetLayout.h

+            SBuildInfo(uint32_t _binding, core::bitflag<typename SBinding::E_CREATE_FLAGS> _createFlags, core::bitflag<IShader::E_SHADER_STAGE> _stageFlags, uint32_t _count)
+                    : binding(_binding), createFlags(_createFlags), stageFlags(_stageFlags), count(_count) {}
+            SBuildInfo(SBuildInfo&& other)
+                    : binding(other.binding), createFlags(other.createFlags), stageFlags(other.stageFlags), count(other.count) {}
+
+            SBuildInfo& operator=(const SBuildInfo& other) = default;


why do we need these?

devshgraphicsprogramming · 2023-04-30T20:58:26Z

include/nbl/core/decl/compile_config.h

@@ -19,7 +19,7 @@
 // this actually includes file depending on build type (Debug/Release)
 #include "BuildConfigOptions.h"

-#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
+#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_) || defined(_NBL_PLATFORM_MACOS_)
 #   define _NBL_POSIX_API_ // Android is not 100% POSIX, but it's close enough


update comment

devshgraphicsprogramming · 2023-04-30T20:59:32Z

include/nbl/core/execution.h

@@ -5,7 +5,7 @@
 #ifndef _NBL_CORE_EXECUTION_H_INCLUDED_
 #define _NBL_CORE_EXECUTION_H_INCLUDED_

-#if __has_include (<execution>)
+#if __has_include (<execution>) and not defined(__clang__)


@pollend does the regular Linux Clang have execution policies?

devshgraphicsprogramming · 2023-04-30T20:59:56Z

include/nbl/core/math/glslFunctions.tcc

+#if defined(__clang__)
+#include <boost/math/special_functions/bessel.hpp>
+#endif //__clang__
+


you might be breaking stuff for @pollend , best you check for AppleClang instead

devshgraphicsprogramming · 2023-04-30T21:00:55Z

include/nbl/system/ISystem.h

+            }
+
+            ~SRequestType() {}
+
+            //! SRequestParams_READ to SRequestType because of std::variant type-safe union
+
+            SRequestType(SRequestParams_READ& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_READ));
+            }
+
+            SRequestType(const SRequestParams_READ& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_READ));
+            }
+
+            SRequestType& operator=(SRequestParams_READ& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_READ));
+                return *this;
+            }
+
+            SRequestType& operator=(const SRequestParams_READ& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_READ));
+                return *this;
+            }
+
+            //! SRequestParams_WRITE to SRequestType because of std::variant type-safe union
+
+            SRequestType(SRequestParams_WRITE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_WRITE));
+            }
+
+            SRequestType(const SRequestParams_WRITE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_WRITE));
+            }
+
+            SRequestType& operator=(SRequestParams_WRITE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_WRITE));
+                return *this;
+            }
+
+            SRequestType& operator=(const SRequestParams_WRITE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_WRITE));
+                return *this;
+            }
+
+            //! SRequestParams_CREATE_FILE to SRequestType because of std::variant type-safe union
+
+            SRequestType(SRequestParams_CREATE_FILE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_CREATE_FILE));
+            }
+
+            SRequestType(const SRequestParams_CREATE_FILE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_CREATE_FILE));
+            }
+
+            SRequestType& operator=(SRequestParams_CREATE_FILE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_CREATE_FILE));
+                return *this;
+            }
+
+            SRequestType& operator=(const SRequestParams_CREATE_FILE& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_CREATE_FILE));
+                return *this;
+            }
+
+            //! SRequestParams_NOOP to SRequestType because of std::variant type-safe union
+
+            SRequestType(SRequestParams_NOOP& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_NOOP));
+            }
+
+            SRequestType(const SRequestParams_NOOP& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_NOOP));
+            }
+
+            SRequestType& operator=(SRequestParams_NOOP& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_NOOP));
+                return *this;
+            }
+
+            SRequestType& operator=(const SRequestParams_NOOP& copy)
+            {
+                std::memmove(this, &copy, sizeof(SRequestParams_NOOP));
+                return *this;
+            }
+


oh god, please no

devshgraphicsprogramming · 2023-04-30T21:01:49Z

src/nbl/CMakeLists.txt

+# Clang special math functions (libc++ shipped on MacOSes doesnt implement some of the special functions)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+	target_include_directories(Nabla PUBLIC "${THIRD_PARTY_SOURCE_DIR}/boost/standalone/math/include")
+endif()


don't check for Clang, only AppleClang

devshgraphicsprogramming · 2023-04-30T21:02:52Z

src/nbl/builtin/builtinHeaderGen.py

-        outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+        outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)


sure this doesn't break windows build and examples now?

devshgraphicsprogramming · 2023-04-30T21:03:40Z

3rdparty/pstl/oneDPL/CMakeLists.txt

+	message(FATAL_ERROR "oneDPL submodule requires valid ONETBB_INSTALL_DIR!")
+endif()
+
+set(TBB_DIR ${ONETBB_INSTALL_DIR}/lib/cmake/TBB CACHE INTERNAL "" FORCE)
+set(ONEDPL_BACKEND tbb CACHE STRING "" FORCE)
+set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH ON CACHE BOOL "")
+set(ONE_DPL_INSTALL_OVERRIDE "${CMAKE_CURRENT_BINARY_DIR}/output" CACHE STRING "" FORCE)
+find_package(Threads REQUIRED)
+
+add_subdirectory(oneDPL oneDPL)


so you need to compile OneDPL for AppleClang to support parallel execution policies?

devshgraphicsprogramming · 2023-04-30T21:09:11Z

src/nbl/system/ISystemPOSIX.cpp

+#if defined(__APPLE__)
+    int createFlags = (writeAccess ? O_CREAT:0);
+#else
+    int createFlags = O_LARGEFILE|(writeAccess ? O_CREAT:0);


did we even need O_LARGEFILE, git blame doesn't tell me much

devshgraphicsprogramming · 2023-04-30T21:09:56Z

btw did you make DXC compile on macOS?

…ubmit all commands within the file to prevent OS wide issues with chmod (which turns out doesn't work even if FILE(CHMOD <..>) is used properly, it may be a CMake bug), temporary disable NBL_UPDATE_GIT_SUBMODULE_NO_SEPARATE_SHELL usage, will bring it back in following commit

…into MacOSX

…ake and update flags.cmake

Arkadiusz Lachowicz and others added 12 commits April 14, 2023 18:57

add macos-clang PLATFORM given apple clang compiler vendor to CMake

453bb2d

Correct dxc's CMakeLists file in order to cover non multi generators,…

c4a41b4

… set CMP0042 policy to NEW (MACOSX_RPATH) and correct top CMakeLists file to not throw warning of unknown compiler - make CMake generate with Sublime Text 2 Ninja generator

remove x86 processor specific compile flags added without respect to …

df32b15

…CMAKE_HOST_SYSTEM_PROCESSOR

generate endian.h and byteswap.h patch headers on fly for AppleClang …

dece03a

…on MacOS ARM builds - fix building of zlibstatic and aesGladman targets

force x86_64 arch builds for all APPLE devices

0039960

Merge branch 'newBuiltinResources' of github.com:Devsh-Graphics-Progr…

ff275de

…amming/Nabla into MacOSX

turn explicit instantiation definition in builtin resources auto-gene…

afe16f6

…rated header into declaration of an explicit template specialization, get rid of AppleClang compile errors on builtin resource targets

add standalone boost math library in order to patch Nabla for MacOS b…

b4b7d9e

…uilds (missing bessel special functions implementation in shipped libc++ by Xcode), update CMakeLists with clang build corrections, add missing typename keywords and fix some compile errors)

Force Xcode legacy build system in order to work with Nabla, add vali…

76e4662

…dation of CMake generator toolset

fix oneDPL & oneTBB Nabla build system and make it work on MacOS with…

50e657d

… AppleClang. Temporary disable installation of tbb targets - TODO. Fix Nabla execution header related errors. Update CMake files. Make a SBuildInfo struct MoveInsertable and eliminate emplate_back errors

bring back installation of tbb targets and coditionally handle tbbmal…

7a6de70

…loc_proxy target

fix dependent type errors, add some copy constructor with assignment …

3d4c2c3

…operators to nbl::system::ISystem::SRequestType because of std::variant type-safe union defined as a member and elimiante some of compile errors

AnastaZIuk changed the base branch from master to newBuiltinResources April 23, 2023 17:04

AnastaZIuk added 2 commits April 24, 2023 16:55

Add CSystemMacOS source and header file, update Nabla codebase with M…

1f024e5

…acOS defines, update CMake files

eliminate last errors and compile Nabla on MacOS with AppleClang and …

b9c830e

…Xcode generator

devshgraphicsprogramming reviewed Apr 30, 2023

View reviewed changes

devshgraphicsprogramming mentioned this pull request May 1, 2023

Builtin Resources CMake Refactor #477

Merged

Base automatically changed from newBuiltinResources to master May 27, 2023 11:12

updated .gitmodules to use DevshGraphicsProgramming forks and SSH

e43df25

AnastaZIuk force-pushed the master branch 3 times, most recently from a07e79f to ffbd843 Compare January 18, 2024 21:24

AnastaZIuk and others added 9 commits July 25, 2024 08:10

pull master & resolve conflicts

1f8548a

second pull from remote & resolve conflicts

0101507

Delete 3rdparty/boost/standalone directory

5752d7e

Merge branch 'MacOSX' of github.com:Devsh-Graphics-Programming/Nabla …

f22f391

…into MacOSX

make NBL_FORCE_ON_UPDATE_GIT_SUBMODULE truely wipe-all thing

e2067c2

make this configure again

e08ee2c

make it generate on my MacOS Air M2 (cross-compile to x86_64)

e7bfe9e

silent all warnings regarding flags & definitions, add apple-clang.cm…

edb3c8d

…ake and update flags.cmake

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MacOS #488

MacOS #488

AnastaZIuk commented Apr 23, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming Apr 30, 2023

devshgraphicsprogramming commented Apr 30, 2023

		outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
		outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)

MacOS #488

Are you sure you want to change the base?

MacOS #488

Conversation

AnastaZIuk commented Apr 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devshgraphicsprogramming commented Apr 30, 2023