rendervulkan: Use getprocaddr for vkCreateImageView

ValveSoftware · Feb 6, 2024 · 5618b6c · 5618b6c
1 parent b14d851
commit 5618b6c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/backend.h b/src/backend.h
@@ -2,8 +2,8 @@
 
 #include "color_helpers.h"
 #include "gamescope_shared.h"
+#include "vulkan_include.h"
 
-#include "vulkan/vulkan_core.h"
 #include <cassert>
 #include <span>
 #include <vector>

diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp
@@ -10,7 +10,7 @@
 #include <array>
 #include <bitset>
 #include <thread>
-#include <vulkan/vulkan_core.h>
+#include "vulkan_include.h"
 
 #if defined(__linux__)
 #include <sys/sysmacros.h>
@@ -2315,7 +2315,7 @@ bool CVulkanTexture::BInit( uint32_t width, uint32_t height, uint32_t depth, uin
 			createInfo.format = VK_FORMAT_R8_UNORM;
 
 			createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_PLANE_0_BIT;
-			res = vkCreateImageView(g_device.device(), &createInfo, nullptr, &m_lumaView);
+			res = g_device.vk.CreateImageView(g_device.device(), &createInfo, nullptr, &m_lumaView);
 			if ( res != VK_SUCCESS ) {
 				vk_errorf( res, "vkCreateImageView failed" );
 				return false;
@@ -2324,7 +2324,7 @@ bool CVulkanTexture::BInit( uint32_t width, uint32_t height, uint32_t depth, uin
 			createInfo.pNext = NULL;
 			createInfo.format = VK_FORMAT_R8G8_UNORM;
 			createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_PLANE_1_BIT;
-			res = vkCreateImageView(g_device.device(), &createInfo, nullptr, &m_chromaView);
+			res = g_device.vk.CreateImageView(g_device.device(), &createInfo, nullptr, &m_chromaView);
 			if ( res != VK_SUCCESS ) {
 				vk_errorf( res, "vkCreateImageView failed" );
 				return false;

diff --git a/src/vulkan_include.h b/src/vulkan_include.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define VK_NO_PROTOTYPES
+#include <vulkan/vulkan_core.h>
diff --git a/src/wlserver.hpp b/src/wlserver.hpp
@@ -11,7 +11,8 @@
 #include <set>
 #include <list>
 #include <optional>
-#include <vulkan/vulkan_core.h>
+
+#include "vulkan_include.h"
 
 #include "steamcompmgr_shared.hpp"