OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/vulkan.h: Switch to the split ProcAddr functions in 130

Browse Source
This commit is contained in:
Jason Ekstrand
2015-07-07 18:51:53 -07:00
parent db24afee2f
commit e7acdda184
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/vulkan/vulkan.h
View File

@@ -1194,6 +1194,7 @@ typedef struct {
bool32_t supportsPinning; bool32_t supportsPinning;
} VkPhysicalDeviceMemoryProperties; } VkPhysicalDeviceMemoryProperties;
typedef void (VKAPI *PFN_vkVoidFunction)(void);
typedef struct { typedef struct {
uint32_t queueNodeIndex; uint32_t queueNodeIndex;
uint32_t queueCount; uint32_t queueCount;
@@ -1898,7 +1899,8 @@ typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCrea
typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance); typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance);
typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices); typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceInfo)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceInfoType infoType, size_t* pDataSize, void* pData); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceInfo)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceInfoType infoType, size_t* pDataSize, void* pData);
typedef void * (VKAPI *PFN_vkGetProcAddr)(VkPhysicalDevice physicalDevice, const char * pName); typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetInstanceProcAddr)(VkInstance instance, const char* pName);
typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetDeviceProcAddr)(VkDevice device, const char* pName);
typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice);
typedef VkResult (VKAPI *PFN_vkDestroyDevice)(VkDevice device); typedef VkResult (VKAPI *PFN_vkDestroyDevice)(VkDevice device);
typedef VkResult (VKAPI *PFN_vkGetGlobalExtensionInfo)(VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); typedef VkResult (VKAPI *PFN_vkGetGlobalExtensionInfo)(VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData);
@@ -2021,8 +2023,12 @@ VkResult VKAPI vkGetPhysicalDeviceInfo(
size_t* pDataSize, size_t* pDataSize,
void* pData); void* pData);
void * VKAPI vkGetProcAddr( PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(
VkPhysicalDevice physicalDevice, VkInstance instance,
const char* pName);
PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(
VkDevice device,
const char* pName); const char* pName);
VkResult VKAPI vkCreateDevice( VkResult VKAPI vkCreateDevice(

11
src/vulkan/device.c
View File

@@ -274,8 +274,15 @@ VkResult anv_GetPhysicalDeviceInfo(
} }
void * vkGetProcAddr( PFN_vkVoidFunction anv_GetInstanceProcAddr(
VkPhysicalDevice physicalDevice, VkInstance instance,
const char* pName)
{
return anv_lookup_entrypoint(pName);
}
PFN_vkVoidFunction anv_GetDeviceProcAddr(
VkDevice device,
const char* pName) const char* pName)
{ {
return anv_lookup_entrypoint(pName); return anv_lookup_entrypoint(pName);

2
src/vulkan/vk_gen.py
View File

@@ -67,6 +67,8 @@ i = 0
for line in fileinput.input(): for line in fileinput.input():
m = p.match(line) m = p.match(line)
if (m): if (m):
if m.group(2) == 'VoidFunction':
continue
fullname = "vk" + m.group(2) fullname = "vk" + m.group(2)
h = hash(fullname) h = hash(fullname)
entrypoints.append((m.group(1), m.group(2), m.group(3), i, h)) entrypoints.append((m.group(1), m.group(2), m.group(3), i, h))