From e16ec5b850840d736d8c1e21af7b4975cb2ee8c6 Mon Sep 17 00:00:00 2001 From: Jordan Halase Date: Sun, 3 Nov 2019 20:15:48 -0600 Subject: Fix loader bug and Windows bug --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 main.c diff --git a/main.c b/main.c old mode 100644 new mode 100755 index eabe67f..28fe4d0 --- a/main.c +++ b/main.c @@ -259,7 +259,7 @@ VkResult createVulkanSurface(PuglView *view, VkWin32SurfaceCreateInfoKHR createInfo = { 0 }; createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; //createInfo.hinstance = GetModuleHandle(0); // FIXME (?) - createInfo.hinstance = puglGetNativeWorld(view->world); + createInfo.hinstance = puglGetNativeWorld(puglGetWorld(view)); createInfo.hwnd = puglGetNativeWindow(view); PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR = @@ -579,7 +579,7 @@ int rvkCreateWorld(struct RenderVulkan **vkOut) static const char *const _vkGetPhysicalDeviceSurfaceCapabilitiesKHR = "vkGetPhysicalDeviceSurfaceCapabilitiesKHR"; vk->api->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)vk->api->vkGetInstanceProcAddr(vk->instance, _vkGetPhysicalDeviceSurfaceCapabilitiesKHR); - if (!vkGetPhysicalDeviceSurfaceCapabilitiesKHR) { + if (!vk->api->vkGetPhysicalDeviceSurfaceCapabilitiesKHR) { rvkSetErrMsg(vk, strErrLd, _vkGetPhysicalDeviceSurfaceCapabilitiesKHR); return -1; } -- cgit v1.2.1