Sometimes GLView.m's initFrame will be called sooner than kickstart, need to accomodate

Author: Just-Feeshy

backends/gpu/metal/sources/device.m

@@ -3,6 +3,7 @@
 #include "metalunit.h"
 
 #include <kore3/gpu/device.h>
+#include <kore3/gpu/metal.h>
 #include <kore3/util/align.h>
 
 #include <kore3/log.h>
@@ -142,23 +143,6 @@ void kore_metal_device_create(kore_gpu_device *device, const kore_gpu_device_wis
 	create_execution_fence(device);
 }
 
-static kore_metal_library_creator_t custom_library_creator = NULL;
-
-void kore_metal_set_library_creator(kore_metal_library_creator_t creator) {
-	custom_library_creator = creator;
-}
-
-id<MTLLibrary> kore_metal_create_library(id<MTLDevice> device) {
-	if (custom_library_creator != NULL) {
-		id<MTLLibrary> library = custom_library_creator(device);
-		if (library != nil) {
-			return library;
-		}
-	}
-	
-	return [device newDefaultLibrary];
-}
-
 void kore_metal_device_destroy(kore_gpu_device *device) {}
 
 void kore_metal_device_set_name(kore_gpu_device *device, const char *name) {}

backends/gpu/metal/sources/metalunit.h

@@ -14,11 +14,6 @@ CAMetalLayer *getMetalLayer(void);
 id getMetalDevice(void);
 id getMetalLibrary(void);
 
-typedef id<MTLLibrary> (*kore_metal_library_creator_t)(id<MTLDevice> device);
-
-void kore_metal_set_library_creator(kore_metal_library_creator_t creator);
-id<MTLLibrary> kore_metal_create_library(id<MTLDevice> device);
-
 static MTLPixelFormat convert_format(kore_gpu_texture_format format) {
 	switch (format) {
 	case KORE_GPU_TEXTURE_FORMAT_UNDEFINED:

backends/system/ios/sources/GLView.m

@@ -11,7 +11,7 @@
 #include <kore3/system.h>
 
 #ifdef KORE_METAL
-#include <kore3/metal/library.h>
+#include <kore3/gpu/metal.h>
 #endif
 
 static const int touchmaxcount = 20;

backends/system/macos/sources/BasicOpenGLView.m

@@ -6,7 +6,7 @@
 #include <kore3/system.h>
 
 #ifdef KORE_METAL
-#include <kore3/metal/library.h>
+#include <kore3/gpu/metal.h>
 #endif
 
 #ifdef KORE_METAL

includes/kore3/gpu/metal.h

@@ -0,0 +1,23 @@
+#ifndef KORE_GPU_METAL_HEADER
+#define KORE_GPU_METAL_HEADER
+
+#ifdef KORE_METAL
+
+#import <Metal/Metal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef id<MTLLibrary> (*kore_metal_library_creator_t)(id<MTLDevice> device);
+
+void kore_metal_set_library_creator(kore_metal_library_creator_t creator);
+id<MTLLibrary> kore_metal_create_library(id<MTLDevice> device);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // KORE_METAL
+
+#endif // KORE_GPU_METAL_HEADER

sources/gpu/metal.c

@@ -0,0 +1,22 @@
+#include <kore3/gpu/metal.h>
+
+#ifdef KORE_METAL
+
+static kore_metal_library_creator_t custom_library_creator = NULL;
+
+void kore_metal_set_library_creator(kore_metal_library_creator_t creator) {
+	custom_library_creator = creator;
+}
+
+id<MTLLibrary> kore_metal_create_library(id<MTLDevice> device) {
+	if (custom_library_creator != NULL) {
+		id<MTLLibrary> library = custom_library_creator(device);
+		if (library != nil) {
+			return library;
+		}
+	}
+	
+	return [device newDefaultLibrary];
+}
+
+#endif // KORE_METAL