AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix interface validation in Vulkan.

Browse Source 
TBR=bsalomon@google.com

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3176

Change-Id: Ifad3249e6839e9b4aa34792646b2d54ff9304da7
Reviewed-on: https://skia-review.googlesource.com/3176
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Greg Daniel 2016-10-11 16:31:05 -04:00 committed by Skia Commit-Bot
parent 7ab96e9219
commit fe2965af79
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gpu/vk/GrVkInterface.h
View File

@ -53,7 +53,7 @@ public:
// Validates that the GrVkInterface supports its advertised standard. This means the necessary
// function pointers have been initialized for Vulkan version.
bool validate() const;
bool validate(uint32_t extensionFlags) const;
/**
* The function pointers are in a struct so that we can have a compiler generated assignment

4
src/gpu/vk/GrVkGpu.cpp
View File

@ -80,6 +80,10 @@ GrGpu* GrVkGpu::Create(GrBackendContext backendContext, const GrContextOptions&
vkBackendContext->ref();
}
if (!vkBackendContext->fInterface->validate(vkBackendContext->fExtensions)) {
return nullptr;
}
return new GrVkGpu(context, options, vkBackendContext);
}

30
src/gpu/vk/GrVkInterface.cpp
View File

@ -12,6 +12,7 @@
GrVkInterface::GrVkInterface() {
}
#define GET_PROC_GLOBAL(F) functions->f ## F = (PFN_vk ## F) vkGetInstanceProcAddr(NULL, "vk" #F)
#define GET_PROC(F) functions->f ## F = (PFN_vk ## F) vkGetInstanceProcAddr(instance, "vk" #F)
#define GET_PROC_LOCAL(inst, F) PFN_vk ## F F = (PFN_vk ## F) vkGetInstanceProcAddr(inst, "vk" #F)
#define GET_DEV_PROC(F) functions->f ## F = (PFN_vk ## F) vkGetDeviceProcAddr(device, "vk" #F)
@ -22,7 +23,9 @@ const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
GrVkInterface* interface = new GrVkInterface();
GrVkInterface::Functions* functions = &interface->fFunctions;
GET_PROC(CreateInstance);
GET_PROC_GLOBAL(CreateInstance);
GET_PROC_GLOBAL(EnumerateInstanceExtensionProperties);
GET_PROC_GLOBAL(EnumerateInstanceLayerProperties);
GET_PROC(DestroyInstance);
GET_PROC(EnumeratePhysicalDevices);
GET_PROC(GetPhysicalDeviceFeatures);
@ -33,9 +36,7 @@ const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
GET_PROC(GetPhysicalDeviceMemoryProperties);
GET_PROC(CreateDevice);
GET_PROC(DestroyDevice);
GET_PROC(EnumerateInstanceExtensionProperties);
GET_PROC(EnumerateDeviceExtensionProperties);
GET_PROC(EnumerateInstanceLayerProperties);
GET_PROC(EnumerateDeviceLayerProperties);
GET_DEV_PROC(GetDeviceQueue);
GET_DEV_PROC(QueueSubmit);
@ -167,11 +168,17 @@ const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
return interface;
}
#ifdef SK_DEBUG
static int kIsDebug = 1;
#else
static int kIsDebug = 0;
#endif
#define RETURN_FALSE_INTERFACE \
if (kIsDebug) { SkDebugf("%s:%d GrVkInterface::validate() failed.\n", __FILE__, __LINE__); } \
return false;
bool GrVkInterface::validate() const {
bool GrVkInterface::validate(uint32_t extensionFlags) const {
// functions that are always required
if (NULL == fFunctions.fCreateInstance ||
NULL == fFunctions.fDestroyInstance ||
@ -307,12 +314,17 @@ bool GrVkInterface::validate() const {
NULL == fFunctions.fCmdBeginRenderPass ||
NULL == fFunctions.fCmdNextSubpass ||
NULL == fFunctions.fCmdEndRenderPass ||
NULL == fFunctions.fCmdExecuteCommands ||
NULL == fFunctions.fCreateDebugReportCallbackEXT ||
NULL == fFunctions.fDebugReportMessageEXT ||
NULL == fFunctions.fDestroyDebugReportCallbackEXT) {
NULL == fFunctions.fCmdExecuteCommands) {
RETURN_FALSE_INTERFACE
}
return false;
if (extensionFlags & kEXT_debug_report_GrVkExtensionFlag) {
if (NULL == fFunctions.fCreateDebugReportCallbackEXT ||
NULL == fFunctions.fDebugReportMessageEXT ||
NULL == fFunctions.fDestroyDebugReportCallbackEXT) {
RETURN_FALSE_INTERFACE
}
}
return true;
}