Merge 24705af into 897ef17

Author: ronsaldo

build.macos32x86/common/Makefile.app

@@ -144,13 +144,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings
 	@mkdir -p $(dir $@)
 	cp -p $< $@
 
-$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu-opengl.xib
 	@mkdir -p $(dir $@)
 	$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
 	--minimum-deployment-target $(TARGET_VERSION_MIN) \
 	--auto-activate-custom-fonts --output-format human-readable-text \
 	--compile $(VMMENUNIB) \
-	$(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+	$(PLATDIR)/iOS/vm/English.lproj/MainMenu-opengl.xib
 
 $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
 	@mkdir -p $(APP)/Contents/Resources

build.macos32x86/common/Makefile.flags

@@ -29,7 +29,7 @@ ifdef CLANG_7_3_OR_ABOVE
 else
 	OBJC_CODE_MODEL := -fno-objc-arc
 endif
-CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
+CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 -DNO_METAL=1 \
 		-arch $(TARGET_ARCH) \
 		-mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \
 			-fvisibility=default -fwrapv \

build.macos64x64/common/Makefile.app

@@ -83,6 +83,8 @@ OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns)
 VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS)))
 VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib
 VMLOCALIZATION:=$(APP)/Contents/Resources/English.lproj/Localizable.strings
+OSXMETAL_SHADERS:=$(wildcard $(OSXDIR)/*.metal)
+VMMETAL_SHADERS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXMETAL_SHADERS:.metal=.metallib)))
 SOURCES:=
 ifneq ($(SOURCEFILE),)
 SOURCES:=./$(SOURCEFILE)
@@ -94,7 +96,7 @@ $(APP)/Contents/Resources/$(APPSOURCE): $(SOURCESDIR)/$(APPSOURCE)
 endif
 
 $(APP):	cleanbundles $(THIRDPARTYPREREQS) $(VMEXE) $(VMBUNDLES) $(VMPLUGINDYLIBS) \
-		$(VMPLIST) $(VMLOCALIZATION) $(VMMENUNIB) $(VMICONS) \
+		$(VMPLIST) $(VMLOCALIZATION) $(VMMENUNIB) $(VMICONS) $(VMMETAL_SHADERS) \
  		$(SOURCES) $(THIRDPARTYLIBS) $(APPPOST) signapp touchapp
 
 # Bundles with missing prerequisites won't be built. But we need to force the
@@ -111,6 +113,10 @@ $(VMEXE): $(OBJDIR)/$(VM)
 	@mkdir -p $(APP)/Contents/MacOS
 	cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS
 
+$(APP)/Contents/Resources/%.metallib: $(OBJDIR)/%.metallib
+	@mkdir -p $(APP)/Contents/Resources
+	cp $< $(APP)/Contents/Resources
+	
 $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle
 	@mkdir -p $(APP)/Contents/Resources
 	@if [ -f $(basename $<).ignore ]; then \

build.macos64x64/common/Makefile.flags

@@ -6,8 +6,8 @@
 XCODE:=$(shell /usr/bin/xcode-select -p)
 XCUB:=$(XCODE)/usr/bin
 SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs
-#Build the oldest SDK installed (must be MacOSX10.10.sdk and later)
-SDKs:=MacOSX10.10.sdk MacOSX10.11.sdk MacOSX10.12.sdk MacOSX10.13.sdk MacOSX10.14.sdk
+#Build the oldest SDK installed (must be MacOSX10.11.sdk because of Metal and later)
+SDKs:=MacOSX10.11.sdk MacOSX10.12.sdk MacOSX10.13.sdk MacOSX10.14.sdk
 SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
 ifeq ($(strip $(SDK)),)
 $(error could not find a valid SDK)
@@ -58,4 +58,5 @@ FRAMEWORKS:=-fobjc-link-runtime \
 			-framework AudioToolbox -framework CoreAudio \
 			-framework SystemConfiguration \
 			-framework ApplicationServices -framework Security \
-			-framework QuartzCore 
+			-framework QuartzCore \
+			-framework Metal -framework MetalKit

build.macos64x64/common/Makefile.rules

@@ -7,10 +7,14 @@
 # /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 CC := clang
 LD := clang
+
 LDCXX := clang++ # For linking c++ bundles
 
 include ../common/Makefile.flags
 
+METAL_CC := xcrun -sdk $(SDK) metal -std=osx-metal1.1
+METAL_LD := xcrun -sdk $(SDK) metallib
+
 DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td
 ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS)
 POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
@@ -27,6 +31,12 @@ $(OBJDIR)/%.o: %.cpp deps/%.d $(MAKEFILE)
 	$(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 
+$(OBJDIR)/%.air: %.metal $(MAKEFILE)
+	$(METAL_CC) $(INCLUDES) -c $< -o $@
+
+$(OBJDIR)/%.metallib: $(OBJDIR)/%.air $(MAKEFILE)
+	$(METAL_LD) $< -o $@
+
 deps/%.d: ;
 
 .PRECIOUS: deps/%.d

build.macos64x64/common/Makefile.vm

@@ -106,6 +106,7 @@ endif
 TZ:=$(shell date +%Z)
 DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
 		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
+		-DUSE_METAL=1 \
 		$(INTERPFLAGS)
 XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS)

platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m

@@ -43,11 +43,13 @@ Some of this code was funded via a grant from the European Smalltalk User Group
 #import "sqSqueakNullScreenAndWindow.h"
 #import "sqaio.h"
 
+#if !defined(USE_METAL)
 # import <OpenGL/gl.h>
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
-# import <OpenGL/OpenGL.h>
-#else
-# import <OpenGL/Opengl.h>
+# if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+#  import <OpenGL/OpenGL.h>
+# else
+#  import <OpenGL/Opengl.h>
+# endif
 #endif
 
 extern sqSqueakAppDelegate *gDelegateApp;
@@ -94,16 +96,19 @@ extern void setIoProcessEventsHandler(void * handler) {
 sqInt ioProcessEvents(void) {
     aioPoll(0);
 
+#if !defined(USE_METAL)
 	// We need to restore the opengl context to whatever the image was
 	// already using. This is required by SDL2 in Pharo.
 	NSOpenGLContext *oldContext = [NSOpenGLContext currentContext];
+#endif
 
 	// We need to run the vmIOProcessEvents even if we are using SDL2,
 	// otherwise we end with some double free errors in an autorelease pool.
 	vmIOProcessEvents();
     if(ioProcessEventsHandler && ioProcessEventsHandler != vmIOProcessEvents)
         ioProcessEventsHandler();
 
+#if !defined(USE_METAL)
 	NSOpenGLContext *newContext = [NSOpenGLContext currentContext];
 	if(oldContext != newContext) {
 		if (oldContext != nil) {
@@ -112,6 +117,7 @@ sqInt ioProcessEvents(void) {
 			[NSOpenGLContext clearCurrentContext];
 		}
 	}
+#endif
 
     return 0;
 }