fixup! JBR-8601 Vulkan: Decouple from Wayland

Author: YaaZ

make/autoconf/lib-vulkan.m4

@@ -108,13 +108,6 @@ AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
     fi
   fi
 
-  # Add platform-specific flags
-  if test "x$VULKAN_ENABLED" = xtrue; then
-    if test "x$NEEDS_LIB_WAYLAND" = xtrue; then
-      VULKAN_FLAGS="$VULKAN_FLAGS -DVK_USE_PLATFORM_WAYLAND_KHR"
-    fi
-  fi
-
   AC_SUBST(VULKAN_ENABLED)
   AC_SUBST(VULKAN_FLAGS)
   AC_SUBST(VULKAN_SHADER_COMPILER)

src/java.desktop/share/classes/sun/java2d/vulkan/VKSurfaceData.java

@@ -67,20 +67,17 @@ public abstract class VKSurfaceData extends SurfaceData
     protected static VKDrawImage vkImagePipe;
 
     static {
-        if (!GraphicsEnvironment.isHeadless()) {
-            VKRenderQueue rq = VKRenderQueue.getInstance();
-            vkImagePipe = new VKDrawImage();
-            vkTextPipe = new VKTextRenderer(rq);
-            vkRenderPipe = new VKRenderer(rq);
-            if (GraphicsPrimitive.tracingEnabled()) {
-                vkTextPipe = vkTextPipe.traceWrap();
-                //The wrapped vkRenderPipe will wrap the AA pipe as well...
-                vkAAPgramPipe = vkRenderPipe.traceWrap();
-            }
-            vkAAPgramPipe = vkRenderPipe.getAAParallelogramPipe();
-            vkTxRenderPipe =
-                    new PixelToParallelogramConverter(vkRenderPipe, vkRenderPipe, 1.0, 0.25, true);
+        VKRenderQueue rq = VKRenderQueue.getInstance();
+        vkImagePipe = new VKDrawImage();
+        vkTextPipe = new VKTextRenderer(rq);
+        vkRenderPipe = new VKRenderer(rq);
+        if (GraphicsPrimitive.tracingEnabled()) {
+            vkTextPipe = vkTextPipe.traceWrap();
+            //The wrapped vkRenderPipe will wrap the AA pipe as well...
+            vkAAPgramPipe = vkRenderPipe.traceWrap();
         }
+        vkAAPgramPipe = vkRenderPipe.getAAParallelogramPipe();
+        vkTxRenderPipe = new PixelToParallelogramConverter(vkRenderPipe, vkRenderPipe, 1.0, 0.25, true);
     }
 
     private final VKFormat format;

src/java.desktop/share/native/common/java2d/vulkan/VKDevice.c

@@ -296,8 +296,6 @@ void VKDevice_CheckAndAdd(VKEnv* vk, VkPhysicalDevice physicalDevice) {
     };
 }
 
-const char* VKFunctionTable_InitDevice(VKEnv* vk, VKDevice* device);
-
 void VKDevice_Reset(VKDevice* device) {
     if (device == NULL) return;
     VKRenderer_Destroy(device->renderer);
@@ -377,13 +375,20 @@ Java_sun_java2d_vulkan_VKGPU_init(JNIEnv *env, jclass jClass, jlong jDevice) {
     }
     J2dRlsTraceLn1(J2D_TRACE_INFO, "VKDevice_init(%s)", device->name);
 
-    const char* missingAPI = VKFunctionTable_InitDevice(vk, device);
-    if (missingAPI != NULL) {
+    VkBool32 missingAPI = JNI_FALSE;
+    DEVICE_FUNCTION_TABLE(CHECK_PROC_ADDR, missingAPI, vk->vkGetDeviceProcAddr, device->handle, device->)
+    if (missingAPI) {
         VKDevice_Reset(device);
-        const char* fixedMessage = "Vulkan: Required API is missing: ";
-        char message[strlen(fixedMessage) + strlen(missingAPI) + 1];
-        strcpy(message, fixedMessage);
-        strcat(message, missingAPI);
+#define REQUIRED_API_MISSING_MESSAGE "Vulkan: Required API is missing: "
+        size_t size = sizeof(REQUIRED_API_MISSING_MESSAGE);
+#define PFN_CALC_MISSING_NAMES_SIZE(_, NAME) if (device->NAME == NULL) size += sizeof(#NAME) + 1;
+        DEVICE_FUNCTION_TABLE(PFN_CALC_MISSING_NAMES_SIZE)
+        char message[size];
+        memcpy(message, REQUIRED_API_MISSING_MESSAGE, size = sizeof(REQUIRED_API_MISSING_MESSAGE) - 1);
+#define PFN_APPEND_MISSING_NAME(_, NAME) if (device->NAME == NULL) { \
+        memcpy(message + size, #NAME ", ", sizeof(#NAME) + 1); size += sizeof(#NAME) + 1; }
+        DEVICE_FUNCTION_TABLE(PFN_APPEND_MISSING_NAME)
+        message[size - 2] = '\0';
         JNU_ThrowByName(env, "java/lang/RuntimeException", message);
         return;
     }

src/java.desktop/share/native/common/java2d/vulkan/VKDevice.h

@@ -29,6 +29,7 @@
 #include "sun_java2d_vulkan_VKSwToSurfaceBlit.h"
 #include "VKTexturePool.h"
 #include "VKUtil.h"
+#include "VKFunctionTable.h"
 
 /**
  * Description of a sampled source type bound to a specific format, supported on the device.
@@ -59,8 +60,7 @@ struct VKDevice {
     VKRenderer*      renderer;
     VKTexturePool*   texturePool;
 
-#define DEVICE_FUNCTION_TABLE_ENTRY(NAME) PFN_ ## NAME NAME
-#include "VKFunctionTable.inl"
+    DEVICE_FUNCTION_TABLE(DECL_PFN)
 };
 
 #endif //VKDevice_h_Included

src/java.desktop/share/native/common/java2d/vulkan/VKEnv.c

@@ -115,22 +115,22 @@ static VkBool32 debugCallback(
 }
 #endif
 
-const char* VKFunctionTable_InitGlobal(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKFunctionTableGlobal* table);
-const char* VKFunctionTable_InitInstance(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKEnv* instance);
-
 static VKEnv* VKEnv_Create(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKPlatformData* platformData) {
     if (vkGetInstanceProcAddr == NULL) return NULL;
 
-    VKFunctionTableGlobal table;
-    const char* missingAPI = VKFunctionTable_InitGlobal(vkGetInstanceProcAddr, &table);
-    if (missingAPI != NULL) {
-        J2dRlsTraceLn1(J2D_TRACE_ERROR, "Vulkan: Required API is missing: %s", missingAPI)
+    // Init global function table.
+    VkBool32 missingAPI = JNI_FALSE;
+    GLOBAL_FUNCTION_TABLE(DECL_PFN)
+    GLOBAL_FUNCTION_TABLE(CHECK_PROC_ADDR, missingAPI, vkGetInstanceProcAddr, NULL,)
+    if (missingAPI) {
+        J2dRlsTraceLn(J2D_TRACE_ERROR, "Vulkan: Required API is missing:")
+        GLOBAL_FUNCTION_TABLE(LOG_MISSING_PFN,)
         return NULL;
     }
 
     uint32_t apiVersion = 0;
 
-    VK_IF_ERROR(table.vkEnumerateInstanceVersion(&apiVersion)) return NULL;
+    VK_IF_ERROR(vkEnumerateInstanceVersion(&apiVersion)) return NULL;
 
     J2dRlsTraceLn3(J2D_TRACE_INFO, "Vulkan: Available (%d.%d.%d)",
                  VK_API_VERSION_MAJOR(apiVersion),
@@ -147,14 +147,14 @@ static VKEnv* VKEnv_Create(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKPl
 
     uint32_t extensionsCount;
     // Get the number of extensions and layers
-    VK_IF_ERROR(table.vkEnumerateInstanceExtensionProperties(NULL, &extensionsCount, NULL)) return NULL;
+    VK_IF_ERROR(vkEnumerateInstanceExtensionProperties(NULL, &extensionsCount, NULL)) return NULL;
     VkExtensionProperties extensions[extensionsCount];
-    VK_IF_ERROR(table.vkEnumerateInstanceExtensionProperties(NULL, &extensionsCount, extensions)) return NULL;
+    VK_IF_ERROR(vkEnumerateInstanceExtensionProperties(NULL, &extensionsCount, extensions)) return NULL;
 
     uint32_t layersCount;
-    VK_IF_ERROR(table.vkEnumerateInstanceLayerProperties(&layersCount, NULL)) return NULL;
+    VK_IF_ERROR(vkEnumerateInstanceLayerProperties(&layersCount, NULL)) return NULL;
     VkLayerProperties layers[layersCount];
-    VK_IF_ERROR(table.vkEnumerateInstanceLayerProperties(&layersCount, layers)) return NULL;
+    VK_IF_ERROR(vkEnumerateInstanceLayerProperties(&layersCount, layers)) return NULL;
 
     J2dRlsTraceLn(J2D_TRACE_VERBOSE, "    Supported instance layers:")
     for (uint32_t i = 0; i < layersCount; i++) {
@@ -266,7 +266,7 @@ static VKEnv* VKEnv_Create(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKPl
             .ppEnabledExtensionNames = enabledExtensions
     };
 
-    VK_IF_ERROR(table.vkCreateInstance(&instanceCreateInfo, NULL, &vk->instance)) {
+    VK_IF_ERROR(vkCreateInstance(&instanceCreateInfo, NULL, &vk->instance)) {
         ARRAY_FREE(enabledLayers);
         ARRAY_FREE(enabledExtensions);
         VKEnv_Destroy(vk);
@@ -276,12 +276,16 @@ static VKEnv* VKEnv_Create(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKPl
     ARRAY_FREE(enabledLayers);
     ARRAY_FREE(enabledExtensions);
 
-    missingAPI = VKFunctionTable_InitInstance(vkGetInstanceProcAddr, vk);
-    if (missingAPI == NULL && vk->platformData != NULL && vk->platformData->checkMissingAPI != NULL) {
-        missingAPI = vk->platformData->checkMissingAPI(vk);
+    INSTANCE_FUNCTION_TABLE(CHECK_PROC_ADDR, missingAPI, vkGetInstanceProcAddr, vk->instance, vk->)
+    DEBUG_INSTANCE_FUNCTION_TABLE(GET_PROC_ADDR, vkGetInstanceProcAddr, vk->instance, vk->)
+    if (missingAPI) {
+        J2dRlsTraceLn(J2D_TRACE_ERROR, "Vulkan: Required API is missing:")
+        INSTANCE_FUNCTION_TABLE(LOG_MISSING_PFN, vk->)
+        VKEnv_Destroy(vk);
+        return NULL;
     }
-    if (missingAPI != NULL) {
-        J2dRlsTraceLn1(J2D_TRACE_ERROR, "Vulkan: Required API is missing: %s", missingAPI)
+    if (vk->platformData != NULL && vk->platformData->initFunctions != NULL &&
+        !vk->platformData->initFunctions(vk, vkGetInstanceProcAddr)) {
         VKEnv_Destroy(vk);
         return NULL;
     }
@@ -290,7 +294,8 @@ static VKEnv* VKEnv_Create(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VKPl
 
     // Create debug messenger
 #if defined(DEBUG)
-    if (foundDebugLayer && foundDebugExt && pNext) {
+    if (foundDebugLayer && foundDebugExt &&
+        vk->vkCreateDebugUtilsMessengerEXT != NULL && pNext) {
         VkDebugUtilsMessengerCreateInfoEXT debugUtilsMessengerCreateInfo = {
                 .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
                 .flags =           0,

src/java.desktop/share/native/common/java2d/vulkan/VKEnv.h

@@ -29,6 +29,7 @@
 #include "VKComposites.h"
 #include "VKDevice.h"
 #include "VKUtil.h"
+#include "VKFunctionTable.h"
 
 // For old Vulkan headers - define version-related macros.
 #ifndef VK_MAKE_API_VERSION
@@ -39,19 +40,14 @@
 #endif
 static const uint32_t REQUIRED_VULKAN_VERSION = VK_MAKE_API_VERSION(0, 1, 2, 0);
 
-typedef const char* (*VKPlatform_CheckMissingAPI)(VKEnv* vk);
+typedef VkBool32 (*VKPlatform_InitFunctions)(VKEnv* vk, PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr);
 typedef VkBool32 (*VKPlatform_CheckPresentationSupport)(VKEnv* vk, VkPhysicalDevice device, uint32_t queueFamily);
 typedef struct {
     const char*                         surfaceExtensionName;
-    VKPlatform_CheckMissingAPI          checkMissingAPI;
+    VKPlatform_InitFunctions            initFunctions;
     VKPlatform_CheckPresentationSupport checkPresentationSupport;
 } VKPlatformData;
 
-typedef struct {
-#define GLOBAL_FUNCTION_TABLE_ENTRY(NAME) PFN_ ## NAME NAME
-#include "VKFunctionTable.inl"
-} VKFunctionTableGlobal;
-
 struct VKEnv {
     VkInstance      instance;
     ARRAY(VKDevice) devices;
@@ -64,9 +60,8 @@ struct VKEnv {
 
     VKPlatformData* platformData;
 
-#define INSTANCE_FUNCTION_TABLE_ENTRY(NAME) PFN_ ## NAME NAME
-#define OPTIONAL_INSTANCE_FUNCTION_TABLE_ENTRY(NAME) PFN_ ## NAME NAME
-#include "VKFunctionTable.inl"
+    INSTANCE_FUNCTION_TABLE(DECL_PFN)
+    DEBUG_INSTANCE_FUNCTION_TABLE(DECL_PFN)
 };
 
 VKEnv* VKEnv_GetInstance();