diff --git a/CMakeLists.txt b/CMakeLists.txt index 703dc7d..2026c20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ elseif(APPLE) find_library(IOKIT_LIBRARY IOKit) find_library(OPENGL_LIBRARY OpenGL) unset(BOO_HAS_METAL CACHE) - if (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.10) + if (NOT CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.11) set(BOO_HAS_METAL ON CACHE BOOL "Metal is available in this OS X version" FORCE) find_library(METAL_LIBRARY Metal) list(APPEND _BOO_SYS_DEFINES -DBOO_HAS_METAL=1) @@ -212,7 +212,7 @@ target_include_directories(glslang-default-resource-limits list(APPEND _BOO_SYS_LIBS glslang soxr xxhash OSDependent OGLCompiler SPIRV glslang-default-resource-limits) set(BOO_SYS_LIBS ${_BOO_SYS_LIBS} CACHE PATH "boo system libraries" FORCE) -set(BOO_SYS_DEFINES ${_BOO_SYS_DEFINES} CACHE PATH "boo system defines" FORCE) +set(BOO_SYS_DEFINES ${_BOO_SYS_DEFINES} CACHE STRING "boo system defines" FORCE) set(BOO_SYS_INCLUDES ${_BOO_SYS_INCLUDES} CACHE PATH "boo system includes" FORCE) add_definitions(${_BOO_SYS_DEFINES}) diff --git a/lib/graphicsdev/Metal.mm b/lib/graphicsdev/Metal.mm index 86b4c90..0addc45 100644 --- a/lib/graphicsdev/Metal.mm +++ b/lib/graphicsdev/Metal.mm @@ -1297,7 +1297,7 @@ IShaderPipeline* MetalDataFactory::Context::newShaderPipeline(const char* vertSo MetalData* d = MetalDataFactoryImpl::m_deferredData.get(); MetalDataFactoryImpl& factory = static_cast(m_parent); MTLCompileOptions* compOpts = [MTLCompileOptions new]; - compOpts.languageVersion = MTLLanguageVersion1_1; + compOpts.languageVersion = MTLLanguageVersion1_2; NSError* err = nullptr; XXH64_state_t hashState;