clang-format the src/WSI directory
Bug: b/144825072
Change-Id: Iabb4e1b2f4bb3da842fdeaa3ad2c6c3816810ae6
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39659
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/WSI/VkSurfaceKHR.cpp b/src/WSI/VkSurfaceKHR.cpp
index c1b0d25..5b5896c 100644
--- a/src/WSI/VkSurfaceKHR.cpp
+++ b/src/WSI/VkSurfaceKHR.cpp
@@ -18,17 +18,14 @@
#include <algorithm>
-namespace
-{
+namespace {
-static const VkSurfaceFormatKHR surfaceFormats[] =
-{
- {VK_FORMAT_B8G8R8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},
- {VK_FORMAT_B8G8R8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},
+static const VkSurfaceFormatKHR surfaceFormats[] = {
+ { VK_FORMAT_B8G8R8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR },
+ { VK_FORMAT_B8G8R8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR },
};
-static const VkPresentModeKHR presentModes[] =
-{
+static const VkPresentModeKHR presentModes[] = {
// FIXME(b/124265819): Make present modes behave correctly. Currently we use XPutImage
// with no synchronization, which behaves more like VK_PRESENT_MODE_IMMEDIATE_KHR. We
// should convert to using the Present extension, which allows us to request presentation
@@ -38,13 +35,13 @@
VK_PRESENT_MODE_MAILBOX_KHR,
};
-}
+} // namespace
namespace vk {
-VkResult PresentImage::allocateImage(VkDevice device, const VkImageCreateInfo& createInfo)
+VkResult PresentImage::allocateImage(VkDevice device, const VkImageCreateInfo &createInfo)
{
- VkImage* vkImagePtr = reinterpret_cast<VkImage*>(allocate(sizeof(VkImage), REQUIRED_MEMORY_ALIGNMENT, DEVICE_MEMORY));
+ VkImage *vkImagePtr = reinterpret_cast<VkImage *>(allocate(sizeof(VkImage), REQUIRED_MEMORY_ALIGNMENT, DEVICE_MEMORY));
if(!vkImagePtr)
{
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -63,12 +60,12 @@
return status;
}
-VkResult PresentImage::allocateAndBindImageMemory(VkDevice device, const VkMemoryAllocateInfo& allocateInfo)
+VkResult PresentImage::allocateAndBindImageMemory(VkDevice device, const VkMemoryAllocateInfo &allocateInfo)
{
ASSERT(image);
- VkDeviceMemory* vkDeviceMemoryPtr = reinterpret_cast<VkDeviceMemory*>(
- allocate(sizeof(VkDeviceMemory), REQUIRED_MEMORY_ALIGNMENT, DEVICE_MEMORY));
+ VkDeviceMemory *vkDeviceMemoryPtr = reinterpret_cast<VkDeviceMemory *>(
+ allocate(sizeof(VkDeviceMemory), REQUIRED_MEMORY_ALIGNMENT, DEVICE_MEMORY));
if(!vkDeviceMemoryPtr)
{
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -123,10 +120,10 @@
pSurfaceCapabilities->currentTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
pSurfaceCapabilities->supportedCompositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
pSurfaceCapabilities->supportedUsageFlags =
- VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
- VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
- VK_IMAGE_USAGE_TRANSFER_DST_BIT |
- VK_IMAGE_USAGE_SAMPLED_BIT;
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
+ VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+ VK_IMAGE_USAGE_TRANSFER_DST_BIT |
+ VK_IMAGE_USAGE_SAMPLED_BIT;
}
uint32_t SurfaceKHR::getSurfaceFormatsCount() const
@@ -179,7 +176,7 @@
return VK_SUCCESS;
}
-void SurfaceKHR::associateSwapchain(SwapchainKHR* swapchain)
+void SurfaceKHR::associateSwapchain(SwapchainKHR *swapchain)
{
associatedSwapchain = swapchain;
}
@@ -210,7 +207,7 @@
VkSurfaceCapabilitiesKHR capabilities;
getSurfaceCapabilities(&capabilities);
- pRects[0].offset = {0,0};
+ pRects[0].offset = { 0, 0 };
pRects[0].extent = capabilities.currentExtent;
*pRectCount = 1;
diff --git a/src/WSI/VkSurfaceKHR.hpp b/src/WSI/VkSurfaceKHR.hpp
index d43b243..8636e2a 100644
--- a/src/WSI/VkSurfaceKHR.hpp
+++ b/src/WSI/VkSurfaceKHR.hpp
@@ -15,8 +15,8 @@
#ifndef SWIFTSHADER_VKSURFACEKHR_HPP_
#define SWIFTSHADER_VKSURFACEKHR_HPP_
-#include "Vulkan/VkObject.hpp"
#include "Vulkan/VkImage.hpp"
+#include "Vulkan/VkObject.hpp"
#include <Vulkan/VulkanPlatform.h>
#include <vector>
@@ -38,20 +38,20 @@
class PresentImage
{
public:
- VkResult allocateImage(VkDevice device, const VkImageCreateInfo& createInfo);
- VkResult allocateAndBindImageMemory(VkDevice device, const VkMemoryAllocateInfo& allocateInfo);
+ VkResult allocateImage(VkDevice device, const VkImageCreateInfo &createInfo);
+ VkResult allocateAndBindImageMemory(VkDevice device, const VkMemoryAllocateInfo &allocateInfo);
void clear();
VkImage asVkImage() const;
- const Image* getImage() const { return image; }
- DeviceMemory* getImageMemory() const { return imageMemory; }
+ const Image *getImage() const { return image; }
+ DeviceMemory *getImageMemory() const { return imageMemory; }
bool isAvailable() const { return (imageStatus == AVAILABLE); }
bool exists() const { return (imageStatus != NONEXISTENT); }
void setStatus(PresentImageStatus status) { imageStatus = status; }
private:
- Image* image = nullptr;
- DeviceMemory* imageMemory = nullptr;
+ Image *image = nullptr;
+ DeviceMemory *imageMemory = nullptr;
PresentImageStatus imageStatus = NONEXISTENT;
};
@@ -65,45 +65,45 @@
return vk::TtoVkT<SurfaceKHR, VkSurfaceKHR>(this);
}
- static inline SurfaceKHR* Cast(VkSurfaceKHR object)
+ static inline SurfaceKHR *Cast(VkSurfaceKHR object)
{
return vk::VkTtoT<SurfaceKHR, VkSurfaceKHR>(object);
}
- void destroy(const VkAllocationCallbacks* pAllocator)
+ void destroy(const VkAllocationCallbacks *pAllocator)
{
destroySurface(pAllocator);
}
- virtual void destroySurface(const VkAllocationCallbacks* pAllocator) = 0;
+ virtual void destroySurface(const VkAllocationCallbacks *pAllocator) = 0;
- virtual void getSurfaceCapabilities(VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) const;
+ virtual void getSurfaceCapabilities(VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) const;
uint32_t getSurfaceFormatsCount() const;
- VkResult getSurfaceFormats(uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const;
+ VkResult getSurfaceFormats(uint32_t *pSurfaceFormatCount, VkSurfaceFormatKHR *pSurfaceFormats) const;
uint32_t getPresentModeCount() const;
- VkResult getPresentModes(uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const;
+ VkResult getPresentModes(uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes) const;
VkResult getPresentRectangles(uint32_t *pRectCount, VkRect2D *pRects) const;
- virtual void attachImage(PresentImage* image) = 0;
- virtual void detachImage(PresentImage* image) = 0;
- virtual VkResult present(PresentImage* image) = 0;
+ virtual void attachImage(PresentImage *image) = 0;
+ virtual void detachImage(PresentImage *image) = 0;
+ virtual VkResult present(PresentImage *image) = 0;
- void associateSwapchain(SwapchainKHR* swapchain);
+ void associateSwapchain(SwapchainKHR *swapchain);
void disassociateSwapchain();
bool hasAssociatedSwapchain();
private:
- SwapchainKHR* associatedSwapchain = nullptr;
+ SwapchainKHR *associatedSwapchain = nullptr;
};
-static inline SurfaceKHR* Cast(VkSurfaceKHR object)
+static inline SurfaceKHR *Cast(VkSurfaceKHR object)
{
return SurfaceKHR::Cast(object);
}
} // namespace vk
-#endif //SWIFTSHADER_VKSURFACEKHR_HPP_
+#endif //SWIFTSHADER_VKSURFACEKHR_HPP_
diff --git a/src/WSI/VkSwapchainKHR.cpp b/src/WSI/VkSwapchainKHR.cpp
index c318b13..6440ab1 100644
--- a/src/WSI/VkSwapchainKHR.cpp
+++ b/src/WSI/VkSwapchainKHR.cpp
@@ -24,20 +24,20 @@
namespace vk {
-SwapchainKHR::SwapchainKHR(const VkSwapchainCreateInfoKHR *pCreateInfo, void *mem) :
- surface(vk::Cast(pCreateInfo->surface)),
- images(reinterpret_cast<PresentImage*>(mem)),
- imageCount(pCreateInfo->minImageCount),
- retired(false)
+SwapchainKHR::SwapchainKHR(const VkSwapchainCreateInfoKHR *pCreateInfo, void *mem)
+ : surface(vk::Cast(pCreateInfo->surface))
+ , images(reinterpret_cast<PresentImage *>(mem))
+ , imageCount(pCreateInfo->minImageCount)
+ , retired(false)
{
- memset(reinterpret_cast<void*>(images), 0, imageCount * sizeof(PresentImage));
+ memset(reinterpret_cast<void *>(images), 0, imageCount * sizeof(PresentImage));
}
void SwapchainKHR::destroy(const VkAllocationCallbacks *pAllocator)
{
for(uint32_t i = 0; i < imageCount; i++)
{
- PresentImage& currentImage = images[i];
+ PresentImage ¤tImage = images[i];
if(currentImage.exists())
{
surface->detachImage(¤tImage);
@@ -67,7 +67,7 @@
for(uint32_t i = 0; i < imageCount; i++)
{
- PresentImage& currentImage = images[i];
+ PresentImage ¤tImage = images[i];
if(currentImage.isAvailable())
{
surface->detachImage(¤tImage);
@@ -125,7 +125,7 @@
VkResult status;
for(uint32_t i = 0; i < imageCount; i++)
{
- PresentImage& currentImage = images[i];
+ PresentImage ¤tImage = images[i];
status = currentImage.allocateImage(device, imageInfo);
if(status != VK_SUCCESS)
@@ -170,11 +170,11 @@
return VK_SUCCESS;
}
-VkResult SwapchainKHR::getNextImage(uint64_t timeout, Semaphore* semaphore, Fence* fence, uint32_t *pImageIndex)
+VkResult SwapchainKHR::getNextImage(uint64_t timeout, Semaphore *semaphore, Fence *fence, uint32_t *pImageIndex)
{
for(uint32_t i = 0; i < imageCount; i++)
{
- PresentImage& currentImage = images[i];
+ PresentImage ¤tImage = images[i];
if(currentImage.isAvailable())
{
currentImage.setStatus(DRAWING);
@@ -199,7 +199,7 @@
VkResult SwapchainKHR::present(uint32_t index)
{
- auto& image = images[index];
+ auto &image = images[index];
image.setStatus(PRESENTING);
VkResult result = surface->present(&image);
image.setStatus(AVAILABLE);
diff --git a/src/WSI/VkSwapchainKHR.hpp b/src/WSI/VkSwapchainKHR.hpp
index 3487cd9..e5aca6e 100644
--- a/src/WSI/VkSwapchainKHR.hpp
+++ b/src/WSI/VkSwapchainKHR.hpp
@@ -15,10 +15,9 @@
#ifndef SWIFTSHADER_VKSWAPCHAINKHR_HPP
#define SWIFTSHADER_VKSWAPCHAINKHR_HPP
-
-#include "Vulkan/VkObject.hpp"
-#include "Vulkan/VkImage.hpp"
#include "VkSurfaceKHR.hpp"
+#include "Vulkan/VkImage.hpp"
+#include "Vulkan/VkObject.hpp"
#include <vector>
@@ -30,38 +29,38 @@
class SwapchainKHR : public Object<SwapchainKHR, VkSwapchainKHR>
{
public:
- SwapchainKHR(const VkSwapchainCreateInfoKHR* pCreateInfo, void* mem);
+ SwapchainKHR(const VkSwapchainCreateInfoKHR *pCreateInfo, void *mem);
- void destroy(const VkAllocationCallbacks* pAllocator);
+ void destroy(const VkAllocationCallbacks *pAllocator);
- static size_t ComputeRequiredAllocationSize(const VkSwapchainCreateInfoKHR* pCreateInfo);
+ static size_t ComputeRequiredAllocationSize(const VkSwapchainCreateInfoKHR *pCreateInfo);
void retire();
- VkResult createImages(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo);
+ VkResult createImages(VkDevice device, const VkSwapchainCreateInfoKHR *pCreateInfo);
uint32_t getImageCount() const;
VkResult getImages(uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) const;
- VkResult getNextImage(uint64_t timeout, Semaphore* semaphore, Fence* fence, uint32_t* pImageIndex);
+ VkResult getNextImage(uint64_t timeout, Semaphore *semaphore, Fence *fence, uint32_t *pImageIndex);
VkResult present(uint32_t index);
PresentImage const &getImage(uint32_t imageIndex) { return images[imageIndex]; }
private:
- SurfaceKHR* surface = nullptr;
- PresentImage* images = nullptr;
+ SurfaceKHR *surface = nullptr;
+ PresentImage *images = nullptr;
uint32_t imageCount = 0;
bool retired = false;
void resetImages();
};
-static inline SwapchainKHR* Cast(VkSwapchainKHR object)
+static inline SwapchainKHR *Cast(VkSwapchainKHR object)
{
return SwapchainKHR::Cast(object);
}
} // namespace vk
-#endif //SWIFTSHADER_VKSWAPCHAINKHR_HPP
+#endif //SWIFTSHADER_VKSWAPCHAINKHR_HPP
diff --git a/src/WSI/Win32SurfaceKHR.cpp b/src/WSI/Win32SurfaceKHR.cpp
index 27ab614..ff13c26 100644
--- a/src/WSI/Win32SurfaceKHR.cpp
+++ b/src/WSI/Win32SurfaceKHR.cpp
@@ -14,30 +14,29 @@
#include "Win32SurfaceKHR.hpp"
-#include "Vulkan/VkDeviceMemory.hpp"
#include "Vulkan/VkDebug.hpp"
+#include "Vulkan/VkDeviceMemory.hpp"
#include <string.h>
-namespace
+namespace {
+VkExtent2D getWindowSize(HWND hwnd)
{
- VkExtent2D getWindowSize(HWND hwnd)
- {
- RECT clientRect = {};
- BOOL status = GetClientRect(hwnd, &clientRect);
- ASSERT(status != 0);
+ RECT clientRect = {};
+ BOOL status = GetClientRect(hwnd, &clientRect);
+ ASSERT(status != 0);
- int windowWidth = clientRect.right - clientRect.left;
- int windowHeight = clientRect.bottom - clientRect.top;
+ int windowWidth = clientRect.right - clientRect.left;
+ int windowHeight = clientRect.bottom - clientRect.top;
- return { static_cast<uint32_t>(windowWidth), static_cast<uint32_t>(windowHeight) };
- }
+ return { static_cast<uint32_t>(windowWidth), static_cast<uint32_t>(windowHeight) };
}
+} // namespace
namespace vk {
-Win32SurfaceKHR::Win32SurfaceKHR(const VkWin32SurfaceCreateInfoKHR *pCreateInfo, void *mem) :
- hwnd(pCreateInfo->hwnd)
+Win32SurfaceKHR::Win32SurfaceKHR(const VkWin32SurfaceCreateInfoKHR *pCreateInfo, void *mem)
+ : hwnd(pCreateInfo->hwnd)
{
ASSERT(IsWindow(hwnd) == TRUE);
windowContext = GetDC(hwnd);
@@ -66,19 +65,19 @@
pSurfaceCapabilities->maxImageExtent = extent;
}
-void Win32SurfaceKHR::attachImage(PresentImage* image)
+void Win32SurfaceKHR::attachImage(PresentImage *image)
{
// Nothing to do here, the current implementation based on GDI blits on
// present instead of associating the image with the surface.
}
-void Win32SurfaceKHR::detachImage(PresentImage* image)
+void Win32SurfaceKHR::detachImage(PresentImage *image)
{
// Nothing to do here, the current implementation based on GDI blits on
// present instead of associating the image with the surface.
}
-VkResult Win32SurfaceKHR::present(PresentImage* image)
+VkResult Win32SurfaceKHR::present(PresentImage *image)
{
// Recreate frame buffer in case window size has changed
lazyCreateFrameBuffer();
@@ -100,7 +99,7 @@
subresourceLayers.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
subresourceLayers.layerCount = 1;
- image->getImage()->blitToBuffer(subresourceLayers, VkOffset3D{}, extent, reinterpret_cast<uint8_t*>(framebuffer), bitmapRowPitch, 0);
+ image->getImage()->blitToBuffer(subresourceLayers, VkOffset3D{}, extent, reinterpret_cast<uint8_t *>(framebuffer), bitmapRowPitch, 0);
StretchBlt(windowContext, 0, 0, extent.width, extent.height, bitmapContext, 0, 0, extent.width, extent.height, SRCCOPY);
@@ -131,7 +130,7 @@
bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFO);
bitmapInfo.bmiHeader.biBitCount = 32;
bitmapInfo.bmiHeader.biPlanes = 1;
- bitmapInfo.bmiHeader.biHeight = -static_cast<LONG>(windowExtent.height); // Negative for top-down DIB, origin in upper-left corner
+ bitmapInfo.bmiHeader.biHeight = -static_cast<LONG>(windowExtent.height); // Negative for top-down DIB, origin in upper-left corner
bitmapInfo.bmiHeader.biWidth = windowExtent.width;
bitmapInfo.bmiHeader.biCompression = BI_RGB;
@@ -154,4 +153,4 @@
framebuffer = nullptr;
}
-}
\ No newline at end of file
+} // namespace vk
\ No newline at end of file
diff --git a/src/WSI/Win32SurfaceKHR.hpp b/src/WSI/Win32SurfaceKHR.hpp
index 4ed0594..0fca5dd 100644
--- a/src/WSI/Win32SurfaceKHR.hpp
+++ b/src/WSI/Win32SurfaceKHR.hpp
@@ -15,21 +15,22 @@
#ifndef SWIFTSHADER_WIN32SURFACEKHR_HPP
#define SWIFTSHADER_WIN32SURFACEKHR_HPP
-#include "Vulkan/VkObject.hpp"
-#include "Vulkan/VkImage.hpp"
#include "VkSurfaceKHR.hpp"
+#include "Vulkan/VkImage.hpp"
+#include "Vulkan/VkObject.hpp"
#if !defined(WIN32_LEAN_AND_MEAN)
-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
#endif // !defined(WIN32_LEAN_AND_MEAN)
-#include <Windows.h>
#include "vulkan/vulkan_win32.h"
+#include <Windows.h>
#include <map>
namespace vk {
-class Win32SurfaceKHR : public SurfaceKHR, public ObjectBase<Win32SurfaceKHR, VkSurfaceKHR> {
+class Win32SurfaceKHR : public SurfaceKHR, public ObjectBase<Win32SurfaceKHR, VkSurfaceKHR>
+{
public:
Win32SurfaceKHR(const VkWin32SurfaceCreateInfoKHR *pCreateInfo, void *mem);
@@ -39,9 +40,9 @@
void getSurfaceCapabilities(VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) const override;
- virtual void attachImage(PresentImage* image) override;
- virtual void detachImage(PresentImage* image) override;
- VkResult present(PresentImage* image) override;
+ virtual void attachImage(PresentImage *image) override;
+ virtual void detachImage(PresentImage *image) override;
+ VkResult present(PresentImage *image) override;
private:
void lazyCreateFrameBuffer();
@@ -58,5 +59,5 @@
void *framebuffer = nullptr;
};
-}
-#endif //SWIFTSHADER_WIN32SURFACEKHR_HPP
+} // namespace vk
+#endif //SWIFTSHADER_WIN32SURFACEKHR_HPP
diff --git a/src/WSI/XcbSurfaceKHR.cpp b/src/WSI/XcbSurfaceKHR.cpp
index 3379e86..b1af1e5 100644
--- a/src/WSI/XcbSurfaceKHR.cpp
+++ b/src/WSI/XcbSurfaceKHR.cpp
@@ -18,10 +18,9 @@
#include <memory>
-namespace
-{
+namespace {
-template <typename FPTR>
+template<typename FPTR>
void getFuncAddress(void *lib, const char *name, FPTR *out)
{
*out = reinterpret_cast<FPTR>(getProcAddress(lib, name));
@@ -45,8 +44,8 @@
xcb_void_cookie_t (*xcb_free_gc)(xcb_connection_t *c, xcb_gcontext_t gc);
uint32_t (*xcb_generate_id)(xcb_connection_t *c);
xcb_get_geometry_cookie_t (*xcb_get_geometry)(xcb_connection_t *c, xcb_drawable_t drawable);
- xcb_get_geometry_reply_t* (*xcb_get_geometry_reply)(xcb_connection_t *c, xcb_get_geometry_cookie_t cookie, xcb_generic_error_t **e);
- xcb_void_cookie_t (*xcb_put_image)(xcb_connection_t *c, uint8_t format, xcb_drawable_t drawable, xcb_gcontext_t gc, uint16_t width,uint16_t height, int16_t dst_x, int16_t dst_y, uint8_t left_pad, uint8_t depth, uint32_t data_len, const uint8_t* data);
+ xcb_get_geometry_reply_t *(*xcb_get_geometry_reply)(xcb_connection_t *c, xcb_get_geometry_cookie_t cookie, xcb_generic_error_t **e);
+ xcb_void_cookie_t (*xcb_put_image)(xcb_connection_t *c, uint8_t format, xcb_drawable_t drawable, xcb_gcontext_t gc, uint16_t width, uint16_t height, int16_t dst_x, int16_t dst_y, uint8_t left_pad, uint8_t depth, uint32_t data_len, const uint8_t *data);
};
class LibXcb
@@ -65,8 +64,7 @@
private:
LibXcbExports *loadExports()
{
- static auto exports = []
- {
+ static auto exports = [] {
if(getProcAddress(RTLD_DEFAULT, "xcb_create_gc"))
{
return std::unique_ptr<LibXcbExports>(new LibXcbExports(RTLD_DEFAULT));
@@ -86,19 +84,18 @@
LibXcb libXcb;
-} // anonymous namespace
+} // anonymous namespace
namespace vk {
-XcbSurfaceKHR::XcbSurfaceKHR(const VkXcbSurfaceCreateInfoKHR *pCreateInfo, void *mem) :
- connection(pCreateInfo->connection),
- window(pCreateInfo->window)
+XcbSurfaceKHR::XcbSurfaceKHR(const VkXcbSurfaceCreateInfoKHR *pCreateInfo, void *mem)
+ : connection(pCreateInfo->connection)
+ , window(pCreateInfo->window)
{
}
void XcbSurfaceKHR::destroySurface(const VkAllocationCallbacks *pAllocator)
{
-
}
size_t XcbSurfaceKHR::ComputeRequiredAllocationSize(const VkXcbSurfaceCreateInfoKHR *pCreateInfo)
@@ -111,7 +108,7 @@
SurfaceKHR::getSurfaceCapabilities(pSurfaceCapabilities);
auto geom = libXcb->xcb_get_geometry_reply(connection, libXcb->xcb_get_geometry(connection, window), nullptr);
- VkExtent2D extent = {static_cast<uint32_t>(geom->width), static_cast<uint32_t>(geom->height)};
+ VkExtent2D extent = { static_cast<uint32_t>(geom->width), static_cast<uint32_t>(geom->height) };
free(geom);
pSurfaceCapabilities->currentExtent = extent;
@@ -119,17 +116,17 @@
pSurfaceCapabilities->maxImageExtent = extent;
}
-void XcbSurfaceKHR::attachImage(PresentImage* image)
+void XcbSurfaceKHR::attachImage(PresentImage *image)
{
- auto gc = libXcb->xcb_generate_id(connection);
+ auto gc = libXcb->xcb_generate_id(connection);
- uint32_t values[2] = {0, 0xffffffff};
- libXcb->xcb_create_gc(connection, gc, window, XCB_GC_FOREGROUND | XCB_GC_BACKGROUND, values);
+ uint32_t values[2] = { 0, 0xffffffff };
+ libXcb->xcb_create_gc(connection, gc, window, XCB_GC_FOREGROUND | XCB_GC_BACKGROUND, values);
graphicsContexts[image] = gc;
}
-void XcbSurfaceKHR::detachImage(PresentImage* image)
+void XcbSurfaceKHR::detachImage(PresentImage *image)
{
auto it = graphicsContexts.find(image);
if(it != graphicsContexts.end())
@@ -139,13 +136,13 @@
}
}
-VkResult XcbSurfaceKHR::present(PresentImage* image)
+VkResult XcbSurfaceKHR::present(PresentImage *image)
{
auto it = graphicsContexts.find(image);
if(it != graphicsContexts.end())
{
auto geom = libXcb->xcb_get_geometry_reply(connection, libXcb->xcb_get_geometry(connection, window), nullptr);
- VkExtent2D windowExtent = {static_cast<uint32_t>(geom->width), static_cast<uint32_t>(geom->height)};
+ VkExtent2D windowExtent = { static_cast<uint32_t>(geom->width), static_cast<uint32_t>(geom->height) };
free(geom);
VkExtent3D extent = image->getImage()->getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
@@ -156,22 +153,22 @@
// TODO: Convert image if not RGB888.
int stride = image->getImage()->rowPitchBytes(VK_IMAGE_ASPECT_COLOR_BIT, 0);
- auto buffer = reinterpret_cast<uint8_t*>(image->getImageMemory()->getOffsetPointer(0));
+ auto buffer = reinterpret_cast<uint8_t *>(image->getImageMemory()->getOffsetPointer(0));
size_t bufferSize = extent.height * stride;
- constexpr int depth = 24; // TODO: Actually use window display depth.
+ constexpr int depth = 24; // TODO: Actually use window display depth.
libXcb->xcb_put_image(
- connection,
- XCB_IMAGE_FORMAT_Z_PIXMAP,
- window,
- it->second,
- extent.width,
- extent.height,
- 0, 0, // dst x, y
- 0, // left_pad
- depth,
- bufferSize, // data_len
- buffer // data
+ connection,
+ XCB_IMAGE_FORMAT_Z_PIXMAP,
+ window,
+ it->second,
+ extent.width,
+ extent.height,
+ 0, 0, // dst x, y
+ 0, // left_pad
+ depth,
+ bufferSize, // data_len
+ buffer // data
);
libXcb->xcb_flush(connection);
@@ -180,4 +177,4 @@
return VK_SUCCESS;
}
-}
\ No newline at end of file
+} // namespace vk
\ No newline at end of file
diff --git a/src/WSI/XcbSurfaceKHR.hpp b/src/WSI/XcbSurfaceKHR.hpp
index e40615e..cc468fa 100644
--- a/src/WSI/XcbSurfaceKHR.hpp
+++ b/src/WSI/XcbSurfaceKHR.hpp
@@ -15,16 +15,17 @@
#ifndef SWIFTSHADER_XCBSURFACEKHR_HPP
#define SWIFTSHADER_XCBSURFACEKHR_HPP
-#include "Vulkan/VkObject.hpp"
#include "VkSurfaceKHR.hpp"
-#include <xcb/xcb.h>
+#include "Vulkan/VkObject.hpp"
#include "vulkan/vulkan_xcb.h"
+#include <xcb/xcb.h>
#include <unordered_map>
namespace vk {
-class XcbSurfaceKHR : public SurfaceKHR, public ObjectBase<XcbSurfaceKHR, VkSurfaceKHR> {
+class XcbSurfaceKHR : public SurfaceKHR, public ObjectBase<XcbSurfaceKHR, VkSurfaceKHR>
+{
public:
XcbSurfaceKHR(const VkXcbSurfaceCreateInfoKHR *pCreateInfo, void *mem);
@@ -34,15 +35,15 @@
void getSurfaceCapabilities(VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) const override;
- virtual void attachImage(PresentImage* image) override;
- virtual void detachImage(PresentImage* image) override;
- VkResult present(PresentImage* image) override;
+ virtual void attachImage(PresentImage *image) override;
+ virtual void detachImage(PresentImage *image) override;
+ VkResult present(PresentImage *image) override;
private:
- xcb_connection_t* connection;
+ xcb_connection_t *connection;
xcb_window_t window;
- std::unordered_map<PresentImage*, uint32_t> graphicsContexts;
+ std::unordered_map<PresentImage *, uint32_t> graphicsContexts;
};
-}
-#endif //SWIFTSHADER_XCBSURFACEKHR_HPP
+} // namespace vk
+#endif //SWIFTSHADER_XCBSURFACEKHR_HPP
diff --git a/src/WSI/XlibSurfaceKHR.cpp b/src/WSI/XlibSurfaceKHR.cpp
index ffa60e2..cdbb2ca 100644
--- a/src/WSI/XlibSurfaceKHR.cpp
+++ b/src/WSI/XlibSurfaceKHR.cpp
@@ -19,22 +19,21 @@
namespace vk {
-XlibSurfaceKHR::XlibSurfaceKHR(const VkXlibSurfaceCreateInfoKHR *pCreateInfo, void *mem) :
- pDisplay(pCreateInfo->dpy),
- window(pCreateInfo->window)
+XlibSurfaceKHR::XlibSurfaceKHR(const VkXlibSurfaceCreateInfoKHR *pCreateInfo, void *mem)
+ : pDisplay(pCreateInfo->dpy)
+ , window(pCreateInfo->window)
{
int screen = DefaultScreen(pDisplay);
gc = libX11->XDefaultGC(pDisplay, screen);
XVisualInfo xVisual;
Status status = libX11->XMatchVisualInfo(pDisplay, screen, 32, TrueColor, &xVisual);
- bool match = (status != 0 && xVisual.blue_mask ==0xFF);
+ bool match = (status != 0 && xVisual.blue_mask == 0xFF);
visual = match ? xVisual.visual : libX11->XDefaultVisual(pDisplay, screen);
}
void XlibSurfaceKHR::destroySurface(const VkAllocationCallbacks *pAllocator)
{
-
}
size_t XlibSurfaceKHR::ComputeRequiredAllocationSize(const VkXlibSurfaceCreateInfoKHR *pCreateInfo)
@@ -48,14 +47,14 @@
XWindowAttributes attr;
libX11->XGetWindowAttributes(pDisplay, window, &attr);
- VkExtent2D extent = {static_cast<uint32_t>(attr.width), static_cast<uint32_t>(attr.height)};
+ VkExtent2D extent = { static_cast<uint32_t>(attr.width), static_cast<uint32_t>(attr.height) };
pSurfaceCapabilities->currentExtent = extent;
pSurfaceCapabilities->minImageExtent = extent;
pSurfaceCapabilities->maxImageExtent = extent;
}
-void XlibSurfaceKHR::attachImage(PresentImage* image)
+void XlibSurfaceKHR::attachImage(PresentImage *image)
{
XWindowAttributes attr;
libX11->XGetWindowAttributes(pDisplay, window, &attr);
@@ -63,37 +62,37 @@
VkExtent3D extent = image->getImage()->getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
int bytes_per_line = image->getImage()->rowPitchBytes(VK_IMAGE_ASPECT_COLOR_BIT, 0);
- char* buffer = static_cast<char*>(image->getImageMemory()->getOffsetPointer(0));
+ char *buffer = static_cast<char *>(image->getImageMemory()->getOffsetPointer(0));
- XImage* xImage = libX11->XCreateImage(pDisplay, visual, attr.depth, ZPixmap, 0, buffer, extent.width, extent.height, 32, bytes_per_line);
+ XImage *xImage = libX11->XCreateImage(pDisplay, visual, attr.depth, ZPixmap, 0, buffer, extent.width, extent.height, 32, bytes_per_line);
imageMap[image] = xImage;
}
-void XlibSurfaceKHR::detachImage(PresentImage* image)
+void XlibSurfaceKHR::detachImage(PresentImage *image)
{
auto it = imageMap.find(image);
if(it != imageMap.end())
{
- XImage* xImage = it->second;
- xImage->data = nullptr; // the XImage does not actually own the buffer
+ XImage *xImage = it->second;
+ xImage->data = nullptr; // the XImage does not actually own the buffer
XDestroyImage(xImage);
imageMap.erase(image);
}
}
-VkResult XlibSurfaceKHR::present(PresentImage* image)
+VkResult XlibSurfaceKHR::present(PresentImage *image)
{
auto it = imageMap.find(image);
if(it != imageMap.end())
{
- XImage* xImage = it->second;
+ XImage *xImage = it->second;
if(xImage->data)
{
XWindowAttributes attr;
libX11->XGetWindowAttributes(pDisplay, window, &attr);
- VkExtent2D windowExtent = {static_cast<uint32_t>(attr.width), static_cast<uint32_t>(attr.height)};
+ VkExtent2D windowExtent = { static_cast<uint32_t>(attr.width), static_cast<uint32_t>(attr.height) };
VkExtent3D extent = image->getImage()->getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
if(windowExtent.width != extent.width || windowExtent.height != extent.height)
@@ -108,4 +107,4 @@
return VK_SUCCESS;
}
-}
\ No newline at end of file
+} // namespace vk
\ No newline at end of file
diff --git a/src/WSI/XlibSurfaceKHR.hpp b/src/WSI/XlibSurfaceKHR.hpp
index 4167b1b..448c979 100644
--- a/src/WSI/XlibSurfaceKHR.hpp
+++ b/src/WSI/XlibSurfaceKHR.hpp
@@ -15,16 +15,17 @@
#ifndef SWIFTSHADER_XLIBSURFACEKHR_HPP
#define SWIFTSHADER_XLIBSURFACEKHR_HPP
-#include "Vulkan/VkObject.hpp"
-#include "libX11.hpp"
#include "VkSurfaceKHR.hpp"
+#include "libX11.hpp"
+#include "Vulkan/VkObject.hpp"
#include "vulkan/vulkan_xlib.h"
#include <unordered_map>
namespace vk {
-class XlibSurfaceKHR : public SurfaceKHR, public ObjectBase<XlibSurfaceKHR, VkSurfaceKHR> {
+class XlibSurfaceKHR : public SurfaceKHR, public ObjectBase<XlibSurfaceKHR, VkSurfaceKHR>
+{
public:
XlibSurfaceKHR(const VkXlibSurfaceCreateInfoKHR *pCreateInfo, void *mem);
@@ -34,17 +35,17 @@
void getSurfaceCapabilities(VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) const override;
- virtual void attachImage(PresentImage* image) override;
- virtual void detachImage(PresentImage* image) override;
- VkResult present(PresentImage* image) override;
+ virtual void attachImage(PresentImage *image) override;
+ virtual void detachImage(PresentImage *image) override;
+ VkResult present(PresentImage *image) override;
private:
Display *const pDisplay;
const Window window;
GC gc;
Visual *visual = nullptr;
- std::unordered_map<PresentImage*, XImage*> imageMap;
+ std::unordered_map<PresentImage *, XImage *> imageMap;
};
-}
-#endif //SWIFTSHADER_XLIBSURFACEKHR_HPP
+} // namespace vk
+#endif //SWIFTSHADER_XLIBSURFACEKHR_HPP
diff --git a/src/WSI/libX11.cpp b/src/WSI/libX11.cpp
index 74e9dd1..68bd2b5 100644
--- a/src/WSI/libX11.cpp
+++ b/src/WSI/libX11.cpp
@@ -20,13 +20,13 @@
namespace {
-template <typename FPTR>
+template<typename FPTR>
void getFuncAddress(void *lib, const char *name, FPTR *out)
{
*out = reinterpret_cast<FPTR>(getProcAddress(lib, name));
}
-} // anonymous namespace
+} // anonymous namespace
LibX11exports::LibX11exports(void *libX11, void *libXext)
{
@@ -67,10 +67,10 @@
if(!libX11)
{
- if(getProcAddress(RTLD_DEFAULT, "XOpenDisplay")) // Search the global scope for pre-loaded X11 library.
+ if(getProcAddress(RTLD_DEFAULT, "XOpenDisplay")) // Search the global scope for pre-loaded X11 library.
{
libX11exports = new LibX11exports(RTLD_DEFAULT, RTLD_DEFAULT);
- libX11 = (void*)-1; // No need to load it.
+ libX11 = (void *)-1; // No need to load it.
}
else
{
@@ -83,7 +83,7 @@
}
else
{
- libX11 = (void*)-1; // Don't attempt loading more than once.
+ libX11 = (void *)-1; // Don't attempt loading more than once.
}
}
}
diff --git a/src/WSI/libX11.hpp b/src/WSI/libX11.hpp
index b923d3d..a51c591 100644
--- a/src/WSI/libX11.hpp
+++ b/src/WSI/libX11.hpp
@@ -30,11 +30,12 @@
int (*XWidthOfScreen)(Screen *screen);
int (*XHeightOfScreen)(Screen *screen);
int (*XPlanesOfScreen)(Screen *screen);
- GC (*XDefaultGC)(Display *display, int screen_number);
+ GC(*XDefaultGC)
+ (Display *display, int screen_number);
int (*XDefaultDepth)(Display *display, int screen_number);
Status (*XMatchVisualInfo)(Display *display, int screen, int depth, int screen_class, XVisualInfo *vinfo_return);
Visual *(*XDefaultVisual)(Display *display, int screen_number);
- int (*(*XSetErrorHandler)(int (*handler)(Display*, XErrorEvent*)))(Display*, XErrorEvent*);
+ int (*(*XSetErrorHandler)(int (*handler)(Display *, XErrorEvent *)))(Display *, XErrorEvent *);
int (*XSync)(Display *display, Bool discard);
XImage *(*XCreateImage)(Display *display, Visual *visual, unsigned int depth, int format, int offset, char *data, unsigned int width, unsigned int height, int bitmap_pad, int bytes_per_line);
int (*XCloseDisplay)(Display *display);
@@ -48,7 +49,7 @@
int (*XShmPutImage)(Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height, bool send_event);
};
-#undef Bool // b/127920555
+#undef Bool // b/127920555
class LibX11
{
@@ -66,4 +67,4 @@
extern LibX11 libX11;
-#endif // libX11_hpp
+#endif // libX11_hpp
