コミット: 4f4831471708220b4be919f80d90fbb081416805 - HotshotOgreIOS (hg)

コミットメタ情報

• リビジョン: 4f4831471708220b4be919f80d90fbb081416805 (tree)
• 日時: 2023-07-08 02:34:47
• 作者: sebastian_bugiu
• コミッター: sebastian_bugiu

ログメッセージ

Added xrOS support as a subplatform of iOS.

変更サマリ

• modified: CMake/Utils/OgreConfigTargets.cmake
• modified: CMakeLists.txt
• modified: OgreMain/src/OgreRoot.cpp
• modified: RenderSystems/Metal/include/OgreMetalPrerequisites.h
• modified: RenderSystems/Metal/src/OgreMetalHardwarePixelBuffer.mm
• modified: RenderSystems/Metal/src/OgreMetalRenderSystem.mm

差分

diff -r 338aa963b202 -r 4f4831471708 CMake/Utils/OgreConfigTargets.cmake
--- a/CMake/Utils/OgreConfigTargets.cmake	Thu Mar 02 10:04:11 2023 +0200
+++ b/CMake/Utils/OgreConfigTargets.cmake	Fri Jul 07 20:34:47 2023 +0300
@@ -243,7 +243,8 @@
          PROPERTIES BUILD_WITH_INSTALL_RPATH 1
          INSTALL_NAME_DIR "@executable_path/../Frameworks"
       )
-      set_target_properties(${LIBNAME} PROPERTIES PUBLIC_HEADER "${HEADER_FILES};${PLATFORM_HEADERS};" )
+      set_source_files_properties("${HEADER_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Headers)
+      set_source_files_properties("${PLATFORM_HEADERS}" PROPERTIES MACOSX_PACKAGE_LOCATION Headers)
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${OGRE_SOURCE_DIR}/OgreMain/include/OgreStableHeaders.h")
       set_target_properties(${LIBNAME} PROPERTIES RESOURCE "${RESOURCE_FILES}")

diff -r 338aa963b202 -r 4f4831471708 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 02 10:04:11 2023 +0200
+++ b/CMakeLists.txt	Fri Jul 07 20:34:47 2023 +0300
@@ -242,6 +242,8 @@
     set(OGRE_STATIC TRUE)
   else ()
     include_directories("${OGRE_SOURCE_DIR}/OgreMain/include/OSX")
+    # Set static early for proper dependency detection
+    set(OGRE_STATIC TRUE)
   endif ()
 endif (APPLE)
 

diff -r 338aa963b202 -r 4f4831471708 OgreMain/src/OgreRoot.cpp
--- a/OgreMain/src/OgreRoot.cpp	Thu Mar 02 10:04:11 2023 +0200
+++ b/OgreMain/src/OgreRoot.cpp	Fri Jul 07 20:34:47 2023 +0300
@@ -114,7 +114,7 @@
 #elif (OGRE_PLATFORM == OGRE_PLATFORM_WIN32)
 //#include "RenderSystems/GL3Plus/include/OgreGL3PlusRenderSystem.h"
 #include "RenderSystems/Direct3D11/include/OgreD3D11RenderSystem.h"
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#elif (OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS || OGRE_PLATFORM == OGRE_PLATFORM_APPLE)
 //#include "../../../RenderSystems/Metal/include/OgreMetalRenderSystem.h"
 #include "../../../RenderSystems/Metal/include/OgreMetalPlugin.h"
 #endif

diff -r 338aa963b202 -r 4f4831471708 RenderSystems/Metal/include/OgreMetalPrerequisites.h
--- a/RenderSystems/Metal/include/OgreMetalPrerequisites.h	Thu Mar 02 10:04:11 2023 +0200
+++ b/RenderSystems/Metal/include/OgreMetalPrerequisites.h	Fri Jul 07 20:34:47 2023 +0300
@@ -90,4 +90,6 @@
 #    define _OgreMetalExport
 #endif
 
+#define PLATFORM_XROS
+
 #endif //#ifndef _OgreMetalPrerequisites_H_

diff -r 338aa963b202 -r 4f4831471708 RenderSystems/Metal/src/OgreMetalHardwarePixelBuffer.mm
--- a/RenderSystems/Metal/src/OgreMetalHardwarePixelBuffer.mm	Thu Mar 02 10:04:11 2023 +0200
+++ b/RenderSystems/Metal/src/OgreMetalHardwarePixelBuffer.mm	Fri Jul 07 20:34:47 2023 +0300
@@ -422,7 +422,7 @@
                             bytesPerRow:rowPitch
                           bytesPerImage:bytesPerImage];
                 break;
-#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS || defined(PLATFORM_XROS)
             case MTLTextureTypeCubeArray:
                 [mTexture replaceRegion:MTLRegionMake3D( dest.left, dest.top, dest.front,
                                                          dest.getWidth(),

diff -r 338aa963b202 -r 4f4831471708 RenderSystems/Metal/src/OgreMetalRenderSystem.mm
--- a/RenderSystems/Metal/src/OgreMetalRenderSystem.mm	Thu Mar 02 10:04:11 2023 +0200
+++ b/RenderSystems/Metal/src/OgreMetalRenderSystem.mm	Fri Jul 07 20:34:47 2023 +0300
@@ -627,7 +627,7 @@
         if( renderTarget->prefersDepthTexture() )
             desc.usage |= MTLTextureUsageShaderRead;
 
-#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS || defined(PLATFORM_XROS)
         desc.storageMode = MTLStorageModePrivate;
 #endif
 
@@ -1192,7 +1192,7 @@
                 ++itor;
             }
 
-#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS || defined(PLATFORM_XROS)
             vertexDescriptor.attributes[15].format      = MTLVertexFormatUInt;
             vertexDescriptor.attributes[15].bufferIndex = 15;
             vertexDescriptor.attributes[15].offset      = 0;
@@ -1629,7 +1629,7 @@
                     "VertexArrayObject::setPrimitiveRange, you've entered an invalid "
                     "primStart; not supported by the Metal API." );
 #endif
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
             for( size_t j=0; j<numVertexBuffers; ++j )
             {
                 //Manually set vertex buffer offsets since in iOS baseVertex is not supported
@@ -1681,7 +1681,7 @@
 
         for( uint32 i=cmd->numDraws; i--; )
         {
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
             //Setup baseInstance.
             [mActiveRenderEncoder setVertexBufferOffset:drawCmd->baseInstance * sizeof(uint32)
                                                 atIndex:15];
@@ -1724,7 +1724,7 @@
             size_t offsetStart;
             metalVertexBuffers[slot] = metalBuffer->getBufferName( offsetStart );
             offsets[slot] = offsetStart;
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
             offsets[slot] += cmd->vertexData->vertexStart * metalBuffer->getVertexSize();
 #endif
             ++itor;
@@ -1753,7 +1753,7 @@
             static_cast<v1::MetalHardwareIndexBuffer*>( mCurrentIndexBuffer->indexBuffer.get() );
         __unsafe_unretained id<MTLBuffer> indexBuffer = metalBuffer->getBufferName( offsetStart );
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
     #if OGRE_DEBUG_MODE
             assert( ((cmd->firstVertexIndex * bytesPerIndexElement) & 0x03) == 0
                     && "Index Buffer must be aligned to 4 bytes. If you're messing with "
@@ -1785,7 +1785,7 @@
     //-------------------------------------------------------------------------
     void MetalRenderSystem::_render( const v1::CbDrawCallStrip *cmd )
     {
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
         //Setup baseInstance.
         [mActiveRenderEncoder setVertexBufferOffset:cmd->baseInstance * sizeof(uint32)
                                             atIndex:15];
@@ -1836,7 +1836,7 @@
                     static_cast<v1::MetalHardwareIndexBuffer*>( mCurrentIndexBuffer->indexBuffer.get() );
                 __unsafe_unretained id<MTLBuffer> indexBuffer = metalBuffer->getBufferName( offsetStart );
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
     #if OGRE_DEBUG_MODE
                     assert( ((mCurrentIndexBuffer->indexStart * bytesPerIndexElement) & 0x03) == 0
                             && "Index Buffer must be aligned to 4 bytes. If you're messing with "
@@ -1876,7 +1876,7 @@
                                                  clamp:0.0f];
                 }
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS && !defined(PLATFORM_XROS)
                 const uint32 vertexStart = 0;
 #else
                 const uint32 vertexStart = static_cast<uint32>( mCurrentVertexBuffer->vertexStart );