summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Halase <jordan@halase.me>2019-11-03 20:15:48 -0600
committerJordan Halase <jordan@halase.me>2019-11-03 20:15:48 -0600
commite16ec5b850840d736d8c1e21af7b4975cb2ee8c6 (patch)
tree5fba5265078d6aa08c3a81600500845c5fd2311b
parentb490c8973dd5137257a5ec004a2d6dbb0b05020a (diff)
Fix loader bug and Windows bug
-rwxr-xr-x[-rw-r--r--]main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index eabe67f..28fe4d0 100644..100755
--- 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;
}