make/lib/Awt2dLibraries.gmk

rev 55352 : JB_base_webrev

*** 244,253 ****
--- 244,255 ----
      LIBS_solaris := $(LIBDL), \
      LIBS_aix := $(LIBDL),\
      LIBS_macosx := -lmlib_image \
          -framework Cocoa \
          -framework OpenGL \
+         -framework Metal \
+         -framework MetalKit \
          -framework JavaNativeFoundation \
          -framework JavaRuntimeSupport \
          -framework ApplicationServices \
          -framework AudioToolbox, \
      LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
*** 823,832 ****
--- 825,836 ----
          $(LIBM) -lpthread -liconv -losxapp \
          -framework ApplicationServices \
          -framework Foundation \
          -framework Security \
          -framework Cocoa \
+         -framework Metal \
+         -framework MetalKit \
          -framework JavaNativeFoundation
    else ifeq ($(call isTargetOs, windows), true)
      LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
    else
      LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
*** 885,894 ****
--- 889,899 ----
    LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
        $(LIBAWT_DEFAULT_HEADER_DIRS) \
        libawt_lwawt/awt \
        libawt_lwawt/font \
        libawt_lwawt/java2d/opengl \
+       libawt_lwawt/java2d/metal \
        include \
        common/awt/debug \
        common/java2d/opengl \
        libosxapp \
        #
*** 920,929 ****
--- 925,936 ----
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
+           -framework Metal \
+           -framework MetalKit \
            -framework Security \
            -framework ExceptionHandling \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
*** 943,952 ****
--- 950,964 ----
  endif
  
  ################################################################################
  
  ifeq ($(call isTargetOs, macosx), true)
+   XCODE_PATH := $(shell /usr/bin/xcode-select -p)
+   CompileMetalShaders :
+         $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal -O2 -std=osx-metal1.1 -o $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt/shaders.metal
+         $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal-ar r $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air
+         $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metallib -o $(INSTALL_LIBRARIES_HERE)/shaders.metallib $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
        NAME := osxui, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB), \
*** 958,975 ****
--- 970,991 ----
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -Wl$(COMMA)-rpath$(COMMA)@loader_path \
            -L$(INSTALL_LIBRARIES_HERE), \
        LIBS := -lawt -losxapp -lawt_lwawt \
            -framework Cocoa \
+           -framework Metal \
+           -framework MetalKit \
+           -framework OpenGL \
            -framework Carbon \
            -framework ApplicationServices \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -ljava -ljvm, \
    ))
  
    TARGETS += $(BUILD_LIBOSXUI)
+   $(BUILD_LIBOSXUI): CompileMetalShaders
  
    $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
  
    $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp)