From 9d452bdb2df85adff77c19ab85cd26b24cbeadbf Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 25 Nov 2015 13:26:15 -0700 Subject: wsi: Moved definition of CreateXxxSurface extension to CMakefile Removed component-specific definitions --- CMakeLists.txt | 6 ++++++ demos/cube.c | 3 --- demos/tri.c | 3 --- demos/vulkaninfo.c | 4 ---- icd/common/icd.h | 8 -------- include/vulkan/vk_layer.h | 4 ++-- layers/object_track.h | 7 ------- loader/loader.c | 5 +++-- loader/loader.h | 9 +-------- loader/wsi.c | 17 ----------------- vk-layer-generate.py | 17 ----------------- 11 files changed, 12 insertions(+), 71 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39698e68..a933991a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,12 @@ project (VULKAN) # vulkan-.dll (and other files). set(MAJOR "0") +if(WIN32) + add_definitions(-DVK_USE_PLATFORM_WIN32_KHR) +else() + add_definitions(-DVK_USE_PLATFORM_XCB_KHR) +endif() + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") # Header file for CMake settings diff --git a/demos/cube.c b/demos/cube.c index 5628c47d..e49ab0b4 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -34,10 +34,7 @@ #ifdef _WIN32 #pragma comment(linker, "/subsystem:windows") -#define VK_USE_PLATFORM_WIN32_KHR #define APP_NAME_STR_LEN 80 -#else // _WIN32 -#define VK_USE_PLATFORM_XCB_KHR #endif // _WIN32 #include diff --git a/demos/tri.c b/demos/tri.c index cf6bb252..d933700c 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -41,10 +41,7 @@ #ifdef _WIN32 #pragma comment(linker, "/subsystem:windows") -#define VK_USE_PLATFORM_WIN32_KHR #define APP_NAME_STR_LEN 80 -#else // _WIN32 -#define VK_USE_PLATFORM_XCB_KHR #endif // _WIN32 #include diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index 7a3cadd7..55cf9696 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -32,12 +32,8 @@ #include #ifdef _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR #include #include - -#else // _WIN32 -#define VK_USE_PLATFORM_XCB_KHR #endif // _WIN32 diff --git a/icd/common/icd.h b/icd/common/icd.h index ec568e70..6b439924 100644 --- a/icd/common/icd.h +++ b/icd/common/icd.h @@ -30,14 +30,6 @@ #ifndef ICD_H #define ICD_H - -// TODO: Generalize for other extension -#ifdef _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR -#else // _WIN32 -#define VK_USE_PLATFORM_XCB_KHR -#endif // _WIN32 - #include #include #include diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index 1e1c252e..47165f77 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -174,6 +174,8 @@ typedef struct VkLayerInstanceDispatchTable_ PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR GetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceFormatsKHR GetPhysicalDeviceSurfaceFormatsKHR; PFN_vkGetPhysicalDeviceSurfacePresentModesKHR GetPhysicalDeviceSurfacePresentModesKHR; + PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; + PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; #ifdef VK_USE_PLATFORM_MIR_KHR PFN_vkCreateMirSurfaceKHR CreateMirSurfaceKHR; PFN_vkGetPhysicalDeviceMirPresentationSupportKHR GetPhysicalDeviceMirPresentationSupportKHR; @@ -194,8 +196,6 @@ typedef struct VkLayerInstanceDispatchTable_ PFN_vkCreateXlibSurfaceKHR CreateXlibSurfaceKHR; PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR GetPhysicalDeviceXlibPresentationSupportKHR; #endif - PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; - PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; } VkLayerInstanceDispatchTable; // LL node for tree of dbg callback functions diff --git a/layers/object_track.h b/layers/object_track.h index 9a435831..ad9a44a7 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -29,13 +29,6 @@ #include "vk_layer_extension_utils.h" #include "vk_enum_string_helper.h" -// TODO: Generalize for other extension -#ifdef _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR -#else // _WIN32 -#define VK_USE_PLATFORM_XCB_KHR -#endif // _WIN32 - // Object Tracker ERROR codes typedef enum _OBJECT_TRACK_ERROR { diff --git a/loader/loader.c b/loader/loader.c index 59a4b961..c1b441b3 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -26,6 +26,7 @@ * Author: Jon Ashburn * */ + #define _GNU_SOURCE #include #include @@ -111,6 +112,8 @@ const VkLayerInstanceDispatchTable instance_disp = { .GetPhysicalDeviceSurfaceCapabilitiesKHR = loader_GetPhysicalDeviceSurfaceCapabilitiesKHR, .GetPhysicalDeviceSurfaceFormatsKHR = loader_GetPhysicalDeviceSurfaceFormatsKHR, .GetPhysicalDeviceSurfacePresentModesKHR = loader_GetPhysicalDeviceSurfacePresentModesKHR, + .DbgCreateMsgCallback = loader_DbgCreateMsgCallback, + .DbgDestroyMsgCallback = loader_DbgDestroyMsgCallback, #ifdef VK_USE_PLATFORM_MIR_KHR .CreateMirSurfaceKHR = vkCreateMirSurfaceKHR, .GetPhysicalDeviceMirPresentationSupportKHR = loader_GetPhysicalDeviceMirPresentationSupportKHR, @@ -131,8 +134,6 @@ const VkLayerInstanceDispatchTable instance_disp = { .CreateXlibSurfaceKHR = vkCreateXlibSurfaceKHR, .GetPhysicalDeviceXlibPresentationSupportKHR = loader_GetPhysicalDeviceXlibPresentationSupportKHR, #endif - .DbgCreateMsgCallback = loader_DbgCreateMsgCallback, - .DbgDestroyMsgCallback = loader_DbgDestroyMsgCallback, }; LOADER_PLATFORM_THREAD_ONCE_DECLARATION(once_init); diff --git a/loader/loader.h b/loader/loader.h index 18766ef6..0c70f591 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -32,14 +32,6 @@ #ifndef LOADER_H #define LOADER_H -#if defined _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR -#else -//#define VK_USE_PLATFORM_MIR_KHR -//#define VK_USE_PLATFORM_WAYLAND_KHR -#define VK_USE_PLATFORM_XCB_KHR -//#define VK_USE_PLATFORM_XLIB_KHR -#endif #include #include @@ -193,6 +185,7 @@ struct loader_icd { #endif #ifdef VK_USE_PLATFORM_XCB_KHR PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR GetPhysicalDeviceXcbPresentationSupportKHR; + PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR; #endif #ifdef VK_USE_PLATFORM_XLIB_KHR PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR GetPhysicalDeviceXlibPresentationSupportKHR; diff --git a/loader/wsi.c b/loader/wsi.c index 7d3616c3..91f47191 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -24,23 +24,6 @@ * Author: Ian Elliott */ -// FIXME/TODO: DEVELOP A BETTER APPROACH FOR SETTING THE DEFAULT VALUES FOR -// THESE PLATFORM-SPECIFIC MACROS APPROPRIATELY: -#ifdef _WIN32 -// The Win32 default is to support the WIN32 platform: -#ifndef VK_USE_PLATFORM_WIN32_KHR -#define VK_USE_PLATFORM_WIN32_KHR -#endif -#else // _WIN32 (i.e. Linux) -// The Linux default is to support the XCB platform: -#if (!defined(VK_USE_PLATFORM_MIR_KHR) && \ - !defined(VK_USE_PLATFORM_WAYLAND_KHR) && \ - !defined(VK_USE_PLATFORM_XCB_KHR) && \ - !defined(VK_USE_PLATFORM_XLIB_KHR)) -#define VK_USE_PLATFORM_XCB_KHR -#endif -#endif // _WIN32 - //#define _ISOC11_SOURCE /* for aligned_alloc() */ #define _GNU_SOURCE #include diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 963d358e..0827704c 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -66,7 +66,6 @@ class Subcommand(object): def generate(self): copyright = self.generate_copyright() - platform_definition = self.platform_definition() header = self.generate_header() body = self.generate_body() footer = self.generate_footer() @@ -74,8 +73,6 @@ class Subcommand(object): contents = [] if copyright: contents.append(copyright) - if platform_definition: - contents.append(platform_definition) if header: contents.append(header) if body: @@ -120,14 +117,6 @@ class Subcommand(object): def generate_header(self): return "\n".join(["#include <" + h + ">" for h in self.headers]) - def platform_definition(self): - pd_body = [] - if sys.platform == 'win32': - pd_body.append('#define VK_USE_PLATFORM_WIN32_KHR') - else: - pd_body.append('#define VK_USE_PLATFORM_XCB_KHR') - return "\n".join(pd_body) - def generate_body(self): pass @@ -1206,12 +1195,6 @@ class ObjectTrackerSubcommand(Subcommand): header_txt.append('#include ') header_txt.append('#include ') header_txt.append('') - # TODO: Add support for different linux flavors, android - if sys.platform == 'win32': - header_txt.append('#define VK_USE_PLATFORM_WIN32_KHR') - else: - header_txt.append('#define VK_USE_PLATFORM_XCB_KHR') - header_txt.append('') header_txt.append('#include "vulkan/vulkan.h"') header_txt.append('#include "vk_loader_platform.h"') header_txt.append('') -- cgit v1.2.3