We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch to enable metal on simulator

patch_metal (text/plain), 2.38 KB, created by Vincent Hamm on 2020-06-25 19:09:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Hamm

Created: 2020-06-25 19:09:56 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
>--- a/include/SDL_config_iphoneos.h
>+++ b/include/SDL_config_iphoneos.h
>@@ -168,8 +168,10 @@
> #define SDL_VIDEO_RENDER_OGL_ES 1
> #define SDL_VIDEO_RENDER_OGL_ES2    1
>
>-/* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer */
>-#if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 90000))
>+/* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer
>+   Also supported in simulator from iOS 13.0 and tvOS 13.0
>+ */
>+#if (TARGET_OS_SIMULATOR && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (__TV_OS_VERSION_MIN_REQUIRED >= 130000))) || (!TARGET_CPU_ARM && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 90000)))
> #define SDL_PLATFORM_SUPPORTS_METAL	1
> #else
> #define SDL_PLATFORM_SUPPORTS_METAL	0
>diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
>--- a/src/render/metal/SDL_render_metal.m
>+++ b/src/render/metal/SDL_render_metal.m
>@@ -40,10 +40,18 @@
> #ifdef __MACOSX__
> #include "SDL_shaders_metal_osx.h"
> #elif defined(__TVOS__)
>+#if TARGET_OS_SIMULATOR
>+#include "SDL_shaders_metal_tvsimulator.h"
>+#else
> #include "SDL_shaders_metal_tvos.h"
>+#endif
>+#else
>+#if TARGET_OS_SIMULATOR
>+#include "SDL_shaders_metal_iphonesimulator.h"
> #else
> #include "SDL_shaders_metal_ios.h"
> #endif
>+#endif
>
> /* Apple Metal renderer implementation */
>
>@@ -52,7 +60,7 @@
>
> /* macOS requires constants in a buffer to have a 256 byte alignment. */
> /* Use native type alignments from https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf */
>-#ifdef __MACOSX__
>+#if defined(__MACOSX__) || TARGET_OS_SIMULATOR
> #define CONSTANT_ALIGN(x) (256)
> #else
> #define CONSTANT_ALIGN(x) (x < 4 ? 4 : x)
>diff --git a/src/render/metal/build-metal-shaders.sh b/src/render/metal/build-metal-shaders.sh
>--- a/src/render/metal/build-metal-shaders.sh
>+++ b/src/render/metal/build-metal-shaders.sh
>@@ -6,7 +6,7 @@
>
> generate_shaders()
> {
>-	fileplatform=$1
>+    fileplatform=$1
>     compileplatform=$2
>     sdkplatform=$3
>     minversion=$4
>@@ -19,4 +19,6 @@
>
> generate_shaders osx osx macosx 10.11
> generate_shaders ios ios iphoneos 8.0
>+generate_shaders iphonesimulator ios iphonesimulator 8.0
> generate_shaders tvos ios appletvos 9.0
>+generate_shaders tvsimulator ios appletvsimulator 9.0

Actions: View | Diff

Attachments on bug 5213: 4395

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.