Merge branch 'apple-silicon'

CMakeLists.txt

@@ -131,6 +131,7 @@ if(MSVC)
   endif()
 
 else()
+  if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
   if(${URDE_VECTOR_ISA} STREQUAL "native")
     add_compile_options(-march=native)
     message(STATUS "Building with native ISA")
@@ -154,6 +155,7 @@ else()
   else()
     message(STATUS "Building with x87 Vector ISA")
   endif()
+  endif()
 
   include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-fno-plt HAS_NO_PLT)

Editor/CMakeLists.txt

@@ -85,6 +85,24 @@ add_executable(urde WIN32 MACOSX_BUNDLE
                Resource.hpp Resource.cpp
                Camera.hpp Camera.cpp
                GameMode.hpp GameMode.cpp)
+
+target_compile_definitions(urde PUBLIC URDE_DLPACKAGE="${URDE_DLPACKAGE}")
+
+target_include_directories(urde PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/Runtime # FIXME atdna cmake issue
+        ${CMAKE_BINARY_DIR})
+
+target_link_libraries(urde
+                      UrdeIcons
+                      UrdeBadging
+                      RuntimeCommon
+                      amuse
+                      RetroDataSpec
+                      kabufuda
+                      ${URDE_PLAT_LIBS})
+
 target_atdna(urde atdna_Space.cpp Space.hpp)
 target_atdna(urde atdna_ResourceBrowser.cpp ResourceBrowser.hpp)
 target_atdna(urde atdna_ModelViewer.cpp ModelViewer.hpp)
@@ -92,15 +110,6 @@ target_atdna(urde atdna_ParticleEditor.cpp ParticleEditor.hpp)
 target_atdna(urde atdna_InformationCenter.cpp InformationCenter.hpp)
 target_atdna(urde atdna_GameMode.cpp GameMode.hpp)
 
-target_compile_definitions(urde PUBLIC URDE_DLPACKAGE="${URDE_DLPACKAGE}")
-
-target_include_directories(urde PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-
-target_link_libraries(urde
-                      UrdeIcons
-                      UrdeBadging
-                      RuntimeCommon
-                      ${URDE_PLAT_LIBS})
 if(COMMAND add_sanitizers)
   add_sanitizers(urde)
 endif()

Editor/main.cpp

@@ -25,6 +25,7 @@ static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) {
       features += _SYS_STR(", ");
     features += str;
   };
+#if __x86_64__
   if (cpuInf.AESNI)
     AddFeature(_SYS_STR("AES-NI"));
   if (cpuInf.SSE1)
@@ -45,6 +46,7 @@ static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) {
     AddFeature(_SYS_STR("AVX"));
   if (cpuInf.AVX2)
     AddFeature(_SYS_STR("AVX2"));
+#endif
   return features;
 }
 

Shaders/CModelShaders.frag.hlsl

@@ -155,7 +155,7 @@ cbuffer ThermalUniform : register(b2) {
 };
 #endif
 
-#if defined(URDE_THERMAL_COLD)
+#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
 float3 LightingFunc(in VertToFrag vtf) {
   return float3(1.0, 1.0, 1.0);
 }
@@ -279,6 +279,12 @@ float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
 }
 #endif
 
+#if defined(URDE_THERMAL_STATIC)
+float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
+  return colorIn;
+}
+#endif
+
 #if defined(URDE_SOLID)
 float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
   return solidColor;

Shaders/CModelShaders.frag.metal

@@ -136,7 +136,7 @@ float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, textur
 }
 #endif
 
-#if defined(URDE_THERMAL_COLD)
+#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
 struct LightingUniform {};
 float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d<float> extTex0, sampler clampSamp) {
   return float3(1.0, 1.0, 1.0);
@@ -267,6 +267,14 @@ float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
 }
 #endif
 
+#if defined(URDE_THERMAL_STATIC)
+float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
+                texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,
+                sampler samp, sampler clampSamp, sampler clampEdgeSamp, float4 colorIn) {
+  return colorIn;
+}
+#endif
+
 #if defined(URDE_SOLID)
 float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
                 texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,