Add some more fixes for Xcode 16.2

This commit is contained in:
David Chavez 2024-12-19 11:41:28 +01:00
parent ad141bfa18
commit 5fcb9965a9
6 changed files with 34 additions and 4 deletions

View File

@ -5,6 +5,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
if (APPLE)
enable_language(OBJC OBJCXX)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
endif()
option(RT64_BUILD_EXAMPLES "Build examples for RT64" OFF)
@ -552,4 +553,11 @@ if (RT64_BUILD_EXAMPLES)
build_vertex_shader( rhi_test "examples/shaders/RenderInterfaceTestPostVS.hlsl")
target_include_directories(rhi_test PRIVATE ${CMAKE_BINARY_DIR}/examples)
if (APPLE)
set_target_properties(rhi_test PROPERTIES
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${PROJECT_SOURCE_DIR}/rt64.entitlements
)
endif()
endif()

View File

@ -10,10 +10,10 @@ struct Constants {
[[vk::push_constant]] ConstantBuffer<Constants> gConstants : register(b0);
SamplerState gSampler : register(s1);
Texture2D<float4> gTexture[8192] : register(t2);
Texture2D<float4> gTexture[2048] : register(t2);
float4 PSMain(in float4 pos : SV_Position, in float2 uv : TEXCOORD0) : SV_TARGET {
float4 result = float4(gTexture[NonUniformResourceIndex(gConstants.textureIndex)].SampleLevel(gSampler, uv, 0).rgb, 1.0f);
result += gConstants.colorAdd;
return result;
}
}

8
rt64.entitlements Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>

View File

@ -31,10 +31,10 @@ SamplerState gClampMirrorSampler : register(s14, space0);
SamplerState gClampClampSampler : register(s15, space0);
// Set 1 - RGBA32 texture cache.
Texture2D<float4> gTextures[8192 * 8192] : register(t0, space1);
Texture2D<float4> gTextures[2048] : register(t0, space1);
// Set 2 - TMEM texture cache.
Texture1D<uint> gTMEM[8192] : register(t0, space2);
// Set 3 - Framebuffer.
ConstantBuffer<FramebufferParams> FbParams : register(b0, space3);
ConstantBuffer<FramebufferParams> FbParams : register(b0, space3);

View File

@ -3,3 +3,10 @@ project(file_to_c)
set(CMAKE_CXX_STANDARD 17)
add_executable(file_to_c "file_to_c.cpp")
if (APPLE)
set_target_properties(file_to_c PROPERTIES
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/rt64.entitlements
)
endif()

View File

@ -12,3 +12,10 @@ add_executable(spirv_cross_msl "spirv_cross_msl.cpp")
target_include_directories(spirv_cross_msl PRIVATE "../../contrib/spirv-cross")
add_subdirectory(../../contrib/spirv-cross ${CMAKE_BINARY_DIR}/spirv-cross)
target_link_libraries(spirv_cross_msl spirv-cross-core spirv-cross-msl)
if (APPLE)
set_target_properties(spirv_cross_msl PROPERTIES
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/rt64.entitlements
)
endif()