a6841be235
This fixes a large number of SkSL namespaces which were labeled as if they were anonymous, and also a handful of other mislabeled namespaces. Missing namespace-end comments have been added throughout. A number of diffs are just indentation-related (adjusting 1- or 3- space indents to 2-space). Change-Id: I6c62052a0d3aea4ae12ca07e0c2a8587b2fce4ec Reviewed-on: https://skia-review.googlesource.com/c/skia/+/308503 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
88 lines
3.1 KiB
C++
88 lines
3.1 KiB
C++
|
|
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/gpu/vk/GrVkVulkan.h"
|
|
|
|
#include "src/gpu/vk/GrVkInterface.h"
|
|
#include "src/gpu/vk/GrVkUtil.h"
|
|
|
|
#include "tools/gpu/vk/VkTestUtils.h"
|
|
|
|
#include "tools/sk_app/VulkanWindowContext.h"
|
|
#include "tools/sk_app/unix/WindowContextFactory_unix.h"
|
|
|
|
#include <X11/Xlib-xcb.h>
|
|
|
|
namespace sk_app {
|
|
|
|
namespace window_context_factory {
|
|
|
|
std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info,
|
|
const DisplayParams& displayParams) {
|
|
PFN_vkGetInstanceProcAddr instProc;
|
|
PFN_vkGetDeviceProcAddr devProc;
|
|
if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
|
|
return nullptr;
|
|
}
|
|
|
|
auto createVkSurface = [&info, instProc](VkInstance instance) -> VkSurfaceKHR {
|
|
static PFN_vkCreateXcbSurfaceKHR createXcbSurfaceKHR = nullptr;
|
|
if (!createXcbSurfaceKHR) {
|
|
createXcbSurfaceKHR =
|
|
(PFN_vkCreateXcbSurfaceKHR) instProc(instance, "vkCreateXcbSurfaceKHR");
|
|
}
|
|
|
|
VkSurfaceKHR surface;
|
|
|
|
VkXcbSurfaceCreateInfoKHR surfaceCreateInfo;
|
|
memset(&surfaceCreateInfo, 0, sizeof(VkXcbSurfaceCreateInfoKHR));
|
|
surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
|
|
surfaceCreateInfo.pNext = nullptr;
|
|
surfaceCreateInfo.flags = 0;
|
|
surfaceCreateInfo.connection = XGetXCBConnection(info.fDisplay);
|
|
surfaceCreateInfo.window = info.fWindow;
|
|
|
|
VkResult res = createXcbSurfaceKHR(instance, &surfaceCreateInfo, nullptr, &surface);
|
|
if (VK_SUCCESS != res) {
|
|
return VK_NULL_HANDLE;
|
|
}
|
|
|
|
return surface;
|
|
};
|
|
|
|
auto canPresent = [&info, instProc](VkInstance instance, VkPhysicalDevice physDev,
|
|
uint32_t queueFamilyIndex) {
|
|
static PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR
|
|
getPhysicalDeviceXcbPresentationSupportKHR = nullptr;
|
|
if (!getPhysicalDeviceXcbPresentationSupportKHR) {
|
|
getPhysicalDeviceXcbPresentationSupportKHR =
|
|
(PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)
|
|
instProc(instance, "vkGetPhysicalDeviceXcbPresentationSupportKHR");
|
|
}
|
|
|
|
|
|
Display* display = info.fDisplay;
|
|
VisualID visualID = info.fVisualInfo->visualid;
|
|
VkBool32 check = getPhysicalDeviceXcbPresentationSupportKHR(physDev,
|
|
queueFamilyIndex,
|
|
XGetXCBConnection(display),
|
|
visualID);
|
|
return (VK_FALSE != check);
|
|
};
|
|
std::unique_ptr<WindowContext> ctx(
|
|
new VulkanWindowContext(displayParams, createVkSurface, canPresent, instProc, devProc));
|
|
if (!ctx->isValid()) {
|
|
return nullptr;
|
|
}
|
|
return ctx;
|
|
}
|
|
|
|
} // namespace window_context_factory
|
|
|
|
} // namespace sk_app
|