Skip to content

S
swiftshader
Commit 0b4bc585 by Ben Clayton
Options

Style: clang-format the tests source too

Move the `.clang-format` rule up one level from `./src` to `.`. Add a `.clang-format` file to `./third_party` that disables formatting. Update `./src/clang-format-all.sh` to include `./tests`. Format all source files in `./tests`. Bug: b/144825072 Change-Id: I01c7ae37a7b1fe8d63ee143107da8acefba20e76 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39873 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com>
parent 4be96b5f
Showing with 177 additions and 152 deletions
src/clang-format-all.sh
SRC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
ROOT_DIR="$( cd "${SRC_DIR}/.." >/dev/null 2>&1 && pwd )"
TESTS_DIR="$( cd "${ROOT_DIR}/tests" >/dev/null 2>&1 && pwd )"
CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
for DIR in "Device" "Pipeline" "Reactor" "System" "Vulkan" "WSI"
for DIR in "${SRC_DIR}/Device" "${SRC_DIR}/Pipeline" "${SRC_DIR}/Reactor" "${SRC_DIR}/System" "${SRC_DIR}/Vulkan" "${SRC_DIR}/WSI" "${TESTS_DIR}"
do
# Double clang-format, as it seems that one pass isn't always enough
find ${SRC_DIR}/${DIR} -iname "*.hpp" -o -iname "*.cpp" -o -iname "*.inl" | xargs ${CLANG_FORMAT} -i -style=file
find ${SRC_DIR}/${DIR} -iname "*.hpp" -o -iname "*.cpp" -o -iname "*.inl" | xargs ${CLANG_FORMAT} -i -style=file
find ${DIR} -iname "*.hpp" -o -iname "*.cpp" -o -iname "*.inl" | xargs ${CLANG_FORMAT} -i -style=file
find ${DIR} -iname "*.hpp" -o -iname "*.cpp" -o -iname "*.inl" | xargs ${CLANG_FORMAT} -i -style=file
done
tests/MathUnitTests/unittests.cpp
......@@ -14,8 +14,8 @@
#include "System/Half.hpp"
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <cstdlib>
......
tests/SystemUnitTests/unittests.cpp
......@@ -14,34 +14,37 @@
#include "System/Memory.hpp"
#ifdef __linux__
#include "System/Linux/MemFd.hpp"
# include "System/Linux/MemFd.hpp"
#endif
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <cstdlib>
using namespace sw;
#ifdef __linux__
TEST(MemFd, DefaultConstructor) {
TEST(MemFd, DefaultConstructor)
{
LinuxMemFd memfd;
ASSERT_FALSE(memfd.isValid());
ASSERT_EQ(-1, memfd.exportFd());
}
TEST(MemFd, AllocatingConstructor) {
TEST(MemFd, AllocatingConstructor)
{
const size_t kRegionSize = sw::memoryPageSize() * 8;
LinuxMemFd memfd("test-region", kRegionSize);
ASSERT_TRUE(memfd.isValid());
ASSERT_GE(memfd.fd(), 0);
void* addr = memfd.mapReadWrite(0, kRegionSize);
void *addr = memfd.mapReadWrite(0, kRegionSize);
ASSERT_TRUE(addr);
memfd.unmap(addr, kRegionSize);
}
TEST(MemFd, ExplicitAllocation) {
TEST(MemFd, ExplicitAllocation)
{
const size_t kRegionSize = sw::memoryPageSize() * 8;
LinuxMemFd memfd;
ASSERT_FALSE(memfd.isValid());
......@@ -50,7 +53,8 @@ TEST(MemFd, ExplicitAllocation) {
ASSERT_TRUE(memfd.isValid());
}
TEST(MemFd, Close) {
TEST(MemFd, Close)
{
const size_t kRegionSize = sw::memoryPageSize() * 8;
LinuxMemFd memfd("test-region", kRegionSize);
ASSERT_TRUE(memfd.isValid());
......@@ -61,12 +65,13 @@ TEST(MemFd, Close) {
::close(fd);
}
TEST(MemFd, ExportImportFd) {
TEST(MemFd, ExportImportFd)
{
const size_t kRegionSize = sw::memoryPageSize() * 8;
LinuxMemFd memfd("test-region1", kRegionSize);
auto* addr = reinterpret_cast<uint8_t*>(memfd.mapReadWrite(0, kRegionSize));
auto *addr = reinterpret_cast<uint8_t *>(memfd.mapReadWrite(0, kRegionSize));
ASSERT_TRUE(addr);
for (size_t n = 0; n < kRegionSize; ++n)
for(size_t n = 0; n < kRegionSize; ++n)
{
addr[n] = static_cast<uint8_t>(n);
}
......@@ -77,9 +82,9 @@ TEST(MemFd, ExportImportFd) {
LinuxMemFd memfd2;
memfd2.importFd(fd);
ASSERT_TRUE(memfd2.isValid());
addr = reinterpret_cast<uint8_t*>(memfd2.mapReadWrite(0, kRegionSize));
addr = reinterpret_cast<uint8_t *>(memfd2.mapReadWrite(0, kRegionSize));
ASSERT_TRUE(addr);
for (size_t n = 0; n < kRegionSize; ++n)
for(size_t n = 0; n < kRegionSize; ++n)
{
ASSERT_EQ(addr[n], static_cast<uint8_t>(n)) << "# " << n;
}
......
tests/VulkanUnitTests/Device.cpp
......@@ -16,29 +16,34 @@
#include "Driver.hpp"
Device::Device()
: driver(nullptr),
device(nullptr),
physicalDevice(nullptr),
queueFamilyIndex(0) {}
: driver(nullptr)
, device(nullptr)
, physicalDevice(nullptr)
, queueFamilyIndex(0)
{}
Device::Device(
Driver const *driver, VkDevice device, VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex)
: driver(driver),
device(device),
physicalDevice(physicalDevice),
queueFamilyIndex(queueFamilyIndex) {}
: driver(driver)
, device(device)
, physicalDevice(physicalDevice)
, queueFamilyIndex(queueFamilyIndex)
{}
Device::~Device()
{
if (device != nullptr)
if(device != nullptr)
{
driver->vkDeviceWaitIdle(device);
driver->vkDestroyDevice(device, nullptr);
}
}
bool Device::IsValid() const { return device != nullptr; }
bool Device::IsValid() const
{
return device != nullptr;
}
VkResult Device::CreateComputeDevice(
Driver const *driver, VkInstance instance, std::unique_ptr<Device> &out)
......@@ -48,16 +53,16 @@ VkResult Device::CreateComputeDevice(
// Gather all physical devices
std::vector<VkPhysicalDevice> physicalDevices;
result = GetPhysicalDevices(driver, instance, physicalDevices);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
// Inspect each physical device's queue families for compute support.
for (auto physicalDevice : physicalDevices)
for(auto physicalDevice : physicalDevices)
{
int queueFamilyIndex = GetComputeQueueFamilyIndex(driver, physicalDevice);
if (queueFamilyIndex < 0)
if(queueFamilyIndex < 0)
{
continue;
}
......@@ -87,7 +92,7 @@ VkResult Device::CreateComputeDevice(
VkDevice device;
result = driver->vkCreateDevice(physicalDevice, &deviceCreateInfo, nullptr, &device);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
......@@ -103,9 +108,9 @@ int Device::GetComputeQueueFamilyIndex(
Driver const *driver, VkPhysicalDevice device)
{
auto properties = GetPhysicalDeviceQueueFamilyProperties(driver, device);
for (uint32_t i = 0; i < properties.size(); i++)
for(uint32_t i = 0; i < properties.size(); i++)
{
if ((properties[i].queueFlags & VK_QUEUE_COMPUTE_BIT) != 0)
if((properties[i].queueFlags & VK_QUEUE_COMPUTE_BIT) != 0)
{
return static_cast<int>(i);
}
......@@ -114,7 +119,7 @@ int Device::GetComputeQueueFamilyIndex(
}
std::vector<VkQueueFamilyProperties>
Device::GetPhysicalDeviceQueueFamilyProperties(
Device::GetPhysicalDeviceQueueFamilyProperties(
Driver const *driver, VkPhysicalDevice device)
{
std::vector<VkQueueFamilyProperties> out;
......@@ -126,12 +131,12 @@ std::vector<VkQueueFamilyProperties>
}
VkResult Device::GetPhysicalDevices(
const Driver* driver, VkInstance instance,
std::vector<VkPhysicalDevice>& out)
const Driver *driver, VkInstance instance,
std::vector<VkPhysicalDevice> &out)
{
uint32_t count = 0;
VkResult result = driver->vkEnumeratePhysicalDevices(instance, &count, 0);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
......@@ -141,7 +146,7 @@ VkResult Device::GetPhysicalDevices(
VkResult Device::CreateStorageBuffer(
VkDeviceMemory memory, VkDeviceSize size,
VkDeviceSize offset, VkBuffer* out) const
VkDeviceSize offset, VkBuffer *out) const
{
const VkBufferCreateInfo info = {
VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // sType
......@@ -156,13 +161,13 @@ VkResult Device::CreateStorageBuffer(
VkBuffer buffer;
VkResult result = driver->vkCreateBuffer(device, &info, 0, &buffer);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
result = driver->vkBindBufferMemory(device, buffer, memory, offset);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
......@@ -177,7 +182,7 @@ void Device::DestroyBuffer(VkBuffer buffer) const
}
VkResult Device::CreateShaderModule(
const std::vector<uint32_t>& spirv, VkShaderModule* out) const
const std::vector<uint32_t> &spirv, VkShaderModule *out) const
{
VkShaderModuleCreateInfo info = {
VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, // sType
......@@ -195,8 +200,8 @@ void Device::DestroyShaderModule(VkShaderModule shaderModule) const
}
VkResult Device::CreateDescriptorSetLayout(
const std::vector<VkDescriptorSetLayoutBinding>& bindings,
VkDescriptorSetLayout* out) const
const std::vector<VkDescriptorSetLayoutBinding> &bindings,
VkDescriptorSetLayout *out) const
{
VkDescriptorSetLayoutCreateInfo info = {
VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, // sType
......@@ -215,7 +220,7 @@ void Device::DestroyDescriptorSetLayout(VkDescriptorSetLayout descriptorSetLayou
}
VkResult Device::CreatePipelineLayout(
VkDescriptorSetLayout layout, VkPipelineLayout* out) const
VkDescriptorSetLayout layout, VkPipelineLayout *out) const
{
VkPipelineLayoutCreateInfo info = {
VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, // sType
......@@ -237,7 +242,7 @@ void Device::DestroyPipelineLayout(VkPipelineLayout pipelineLayout) const
VkResult Device::CreateComputePipeline(
VkShaderModule module, VkPipelineLayout pipelineLayout,
VkPipeline* out) const
VkPipeline *out) const
{
VkComputePipelineCreateInfo info = {
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, // sType
......@@ -267,7 +272,7 @@ void Device::DestroyPipeline(VkPipeline pipeline) const
}
VkResult Device::CreateStorageBufferDescriptorPool(uint32_t descriptorCount,
VkDescriptorPool* out) const
VkDescriptorPool *out) const
{
VkDescriptorPoolSize size = {
VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, // type
......@@ -293,7 +298,7 @@ void Device::DestroyDescriptorPool(VkDescriptorPool descriptorPool) const
VkResult Device::AllocateDescriptorSet(
VkDescriptorPool pool, VkDescriptorSetLayout layout,
VkDescriptorSet* out) const
VkDescriptorSet *out) const
{
VkDescriptorSetAllocateInfo info = {
VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, // sType
......@@ -308,11 +313,11 @@ VkResult Device::AllocateDescriptorSet(
void Device::UpdateStorageBufferDescriptorSets(
VkDescriptorSet descriptorSet,
const std::vector<VkDescriptorBufferInfo>& bufferInfos) const
const std::vector<VkDescriptorBufferInfo> &bufferInfos) const
{
std::vector<VkWriteDescriptorSet> writes;
writes.reserve(bufferInfos.size());
for (uint32_t i = 0; i < bufferInfos.size(); i++)
for(uint32_t i = 0; i < bufferInfos.size(); i++)
{
writes.push_back(VkWriteDescriptorSet{
VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, // sType
......@@ -331,19 +336,19 @@ void Device::UpdateStorageBufferDescriptorSets(
driver->vkUpdateDescriptorSets(device, writes.size(), writes.data(), 0, nullptr);
}
VkResult Device::AllocateMemory(size_t size, VkMemoryPropertyFlags flags, VkDeviceMemory* out) const
VkResult Device::AllocateMemory(size_t size, VkMemoryPropertyFlags flags, VkDeviceMemory *out) const
{
VkPhysicalDeviceMemoryProperties properties;
driver->vkGetPhysicalDeviceMemoryProperties(physicalDevice, &properties);
for(uint32_t type = 0; type < properties.memoryTypeCount; type++)
{
if ((flags & properties.memoryTypes[type].propertyFlags) == 0)
if((flags & properties.memoryTypes[type].propertyFlags) == 0)
{
continue; // Type mismatch
}
if (size > properties.memoryHeaps[properties.memoryTypes[type].heapIndex].size)
if(size > properties.memoryHeaps[properties.memoryTypes[type].heapIndex].size)
{
continue; // Too small.
}
......@@ -377,7 +382,7 @@ void Device::UnmapMemory(VkDeviceMemory memory) const
driver->vkUnmapMemory(device, memory);
}
VkResult Device::CreateCommandPool(VkCommandPool* out) const
VkResult Device::CreateCommandPool(VkCommandPool *out) const
{
VkCommandPoolCreateInfo info = {
VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType
......@@ -394,7 +399,7 @@ void Device::DestroyCommandPool(VkCommandPool commandPool) const
}
VkResult Device::AllocateCommandBuffer(
VkCommandPool pool, VkCommandBuffer* out) const
VkCommandPool pool, VkCommandBuffer *out) const
{
VkCommandBufferAllocateInfo info = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType
......@@ -442,7 +447,7 @@ VkResult Device::QueueSubmitAndWait(VkCommandBuffer commandBuffer) const
};
VkResult result = driver->vkQueueSubmit(queue, 1, &info, 0);
if (result != VK_SUCCESS)
if(result != VK_SUCCESS)
{
return result;
}
......
tests/VulkanUnitTests/Device.hpp
......@@ -35,7 +35,7 @@ public:
// returned (as there was no Vulkan error), but calling Device::IsValid()
// on this device will return false.
static VkResult CreateComputeDevice(
Driver const *driver, VkInstance instance, std::unique_ptr<Device>& out);
Driver const *driver, VkInstance instance, std::unique_ptr<Device> &out);
// IsValid returns true if the Device is initialized and can be used.
bool IsValid() const;
......@@ -105,7 +105,7 @@ public:
// given flag bits set.
// If memory could not be allocated from any heap then
// VK_ERROR_OUT_OF_DEVICE_MEMORY is returned.
VkResult AllocateMemory(size_t size, VkMemoryPropertyFlags flags, VkDeviceMemory* out) const;
VkResult AllocateMemory(size_t size, VkMemoryPropertyFlags flags, VkDeviceMemory *out) const;
// FreeMemory frees the VkDeviceMemory.
void FreeMemory(VkDeviceMemory memory) const;
......@@ -118,13 +118,13 @@ public:
void UnmapMemory(VkDeviceMemory memory) const;
// CreateCommandPool creates a new command pool.
VkResult CreateCommandPool(VkCommandPool* out) const;
VkResult CreateCommandPool(VkCommandPool *out) const;
// DestroyCommandPool destroys a VkCommandPool.
void DestroyCommandPool(VkCommandPool commandPool) const;
// AllocateCommandBuffer creates a new command buffer with a primary level.
VkResult AllocateCommandBuffer(VkCommandPool pool, VkCommandBuffer* out) const;
VkResult AllocateCommandBuffer(VkCommandPool pool, VkCommandBuffer *out) const;
// FreeCommandBuffer frees the VkCommandBuffer.
void FreeCommandBuffer(VkCommandPool pool, VkCommandBuffer buffer);
......@@ -146,7 +146,6 @@ public:
private:
Device(Driver const *driver, VkDevice device, VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex);
static std::vector<VkQueueFamilyProperties>
GetPhysicalDeviceQueueFamilyProperties(
Driver const *driver, VkPhysicalDevice device);
......
tests/VulkanUnitTests/Driver.cpp
......@@ -33,8 +33,9 @@
# error Unimplemented platform
#endif
Driver::Driver() : vk_icdGetInstanceProcAddr(nullptr), dll(nullptr)
{
Driver::Driver()
: vk_icdGetInstanceProcAddr(nullptr)
, dll(nullptr){
#define VK_GLOBAL(N, R, ...) N = nullptr
#include "VkGlobalFuncs.hpp"
#undef VK_GLOBAL
......@@ -42,9 +43,9 @@ Driver::Driver() : vk_icdGetInstanceProcAddr(nullptr), dll(nullptr)
#define VK_INSTANCE(N, R, ...) N = nullptr
#include "VkInstanceFuncs.hpp"
#undef VK_INSTANCE
}
}
Driver::~Driver()
Driver::~Driver()
{
unload();
}
......@@ -52,33 +53,33 @@ Driver::~Driver()
bool Driver::loadSwiftShader()
{
#if OS_WINDOWS
#if !defined(STANDALONE)
# if !defined(STANDALONE)
// The DLL is delay loaded (see BUILD.gn), so we can load
// the correct ones from Chrome's swiftshader subdirectory.
HMODULE libvulkan = LoadLibraryA("swiftshader\\libvulkan.dll");
EXPECT_NE((HMODULE)NULL, libvulkan);
return true;
#elif defined(NDEBUG)
#if defined(_WIN64)
# elif defined(NDEBUG)
# if defined(_WIN64)
return load("./build/Release_x64/vk_swiftshader.dll") ||
load("./build/Release/vk_swiftshader.dll") ||
load("./vk_swiftshader.dll");
#else
# else
return load("./build/Release_Win32/vk_swiftshader.dll") ||
load("./build/Release/vk_swiftshader.dll") ||
load("./vk_swiftshader.dll");
#endif
#else
#if defined(_WIN64)
# endif
# else
# if defined(_WIN64)
return load("./build/Debug_x64/vk_swiftshader.dll") ||
load("./build/Debug/vk_swiftshader.dll") ||
load("./vk_swiftshader.dll");
#else
# else
return load("./build/Debug_Win32/vk_swiftshader.dll") ||
load("./build/Debug/vk_swiftshader.dll") ||
load("./vk_swiftshader.dll");
#endif
#endif
# endif
# endif
#elif OS_MAC
return load("./build/Darwin/libvk_swiftshader.dylib") ||
load("swiftshader/libvk_swiftshader.dylib") ||
......@@ -91,7 +92,7 @@ bool Driver::loadSwiftShader()
#elif OS_ANDROID || OS_FUCHSIA
return load("libvk_swiftshader.so");
#else
#error Unimplemented platform
# error Unimplemented platform
#endif
}
......@@ -104,7 +105,7 @@ bool Driver::loadSystem()
#endif
}
bool Driver::load(const char* path)
bool Driver::load(const char *path)
{
#if OS_WINDOWS
dll = LoadLibraryA(path);
......@@ -148,7 +149,7 @@ void Driver::unload()
#if OS_WINDOWS
FreeLibrary((HMODULE)dll);
#elif (OS_LINUX || OS_FUCHSIA)
#elif(OS_LINUX || OS_FUCHSIA)
dlclose(dll);
#endif
......@@ -188,7 +189,7 @@ bool Driver::resolve(VkInstance instance)
return true;
}
void* Driver::lookup(const char* name)
void *Driver::lookup(const char *name)
{
#if OS_WINDOWS
return GetProcAddress((HMODULE)dll, name);
......
tests/VulkanUnitTests/Driver.hpp
......@@ -33,7 +33,7 @@ public:
// load attempts to load the vulkan driver from the given path.
// returns true on success, false on failure.
bool load(const char* path);
bool load(const char *path);
// unloads the currently loaded driver.
// No-op if no driver is currently loaded.
......@@ -45,40 +45,40 @@ public:
// resolve all the functions for the given VkInstance.
bool resolve(VkInstance);
VKAPI_ATTR PFN_vkVoidFunction(VKAPI_CALL* vk_icdGetInstanceProcAddr)(VkInstance instance, const char* pName);
VKAPI_ATTR PFN_vkVoidFunction(VKAPI_CALL *vk_icdGetInstanceProcAddr)(VkInstance instance, const char *pName);
// Global vulkan function pointers.
#define VK_GLOBAL(N, R, ...) VKAPI_ATTR R (VKAPI_CALL *N)(__VA_ARGS__)
#define VK_GLOBAL(N, R, ...) VKAPI_ATTR R(VKAPI_CALL *N)(__VA_ARGS__)
#include "VkGlobalFuncs.hpp"
#undef VK_GLOBAL
// Per-instance vulkan function pointers.
#define VK_INSTANCE(N, R, ...) VKAPI_ATTR R (VKAPI_CALL *N)(__VA_ARGS__)
#define VK_INSTANCE(N, R, ...) VKAPI_ATTR R(VKAPI_CALL *N)(__VA_ARGS__)
#include "VkInstanceFuncs.hpp"
#undef VK_INSTANCE
private:
Driver(const Driver&) = delete;
Driver(Driver&&) = delete;
Driver& operator=(const Driver&) = delete;
Driver(const Driver &) = delete;
Driver(Driver &&) = delete;
Driver &operator=(const Driver &) = delete;
// lookup searches the loaded driver for a symbol with the given name,
// returning the address of this symbol if found, otherwise nullptr.
void* lookup(const char* name);
void *lookup(const char *name);
// Helper function to lookup a symbol and cast it to the appropriate type.
// Returns true if the symbol was found and assigned to ptr, otherwise
// returns false.
template<typename T>
inline bool lookup(T* ptr, const char* name);
inline bool lookup(T *ptr, const char *name);
void* dll;
void *dll;
};
template<typename T>
bool Driver::lookup(T* ptr, const char* name)
bool Driver::lookup(T *ptr, const char *name)
{
void* sym = lookup(name);
void *sym = lookup(name);
if(sym == nullptr)
{
return false;
......
tests/VulkanUnitTests/VkGlobalFuncs.hpp
......@@ -17,5 +17,5 @@
// TODO: Generate this list.
// VK_GLOBAL(<function name>, <return type>, <arguments>...)
VK_GLOBAL(vkCreateInstance, VkResult, const VkInstanceCreateInfo*, const VkAllocationCallbacks*, VkInstance*);
VK_GLOBAL(vkEnumerateInstanceVersion, VkResult, uint32_t*);
VK_GLOBAL(vkCreateInstance, VkResult, const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *);
VK_GLOBAL(vkEnumerateInstanceVersion, VkResult, uint32_t *);
tests/VulkanUnitTests/VkInstanceFuncs.hpp
......@@ -17,53 +17,53 @@
// TODO: Generate this list.
// VK_INSTANCE(<function name>, <return type>, <arguments>...)
VK_INSTANCE(vkAllocateCommandBuffers, VkResult, VkDevice, const VkCommandBufferAllocateInfo*, VkCommandBuffer*);
VK_INSTANCE(vkAllocateDescriptorSets, VkResult, VkDevice, const VkDescriptorSetAllocateInfo*, VkDescriptorSet*);
VK_INSTANCE(vkAllocateMemory, VkResult, VkDevice, const VkMemoryAllocateInfo*, const VkAllocationCallbacks*,
VkDeviceMemory*);
VK_INSTANCE(vkBeginCommandBuffer, VkResult, VkCommandBuffer, const VkCommandBufferBeginInfo*);
VK_INSTANCE(vkAllocateCommandBuffers, VkResult, VkDevice, const VkCommandBufferAllocateInfo *, VkCommandBuffer *);
VK_INSTANCE(vkAllocateDescriptorSets, VkResult, VkDevice, const VkDescriptorSetAllocateInfo *, VkDescriptorSet *);
VK_INSTANCE(vkAllocateMemory, VkResult, VkDevice, const VkMemoryAllocateInfo *, const VkAllocationCallbacks *,
VkDeviceMemory *);
VK_INSTANCE(vkBeginCommandBuffer, VkResult, VkCommandBuffer, const VkCommandBufferBeginInfo *);
VK_INSTANCE(vkBindBufferMemory, VkResult, VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize);
VK_INSTANCE(vkCmdBindDescriptorSets, void, VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t,
const VkDescriptorSet*, uint32_t, const uint32_t*);
const VkDescriptorSet *, uint32_t, const uint32_t *);
VK_INSTANCE(vkCmdBindPipeline, void, VkCommandBuffer, VkPipelineBindPoint, VkPipeline);
VK_INSTANCE(vkCmdDispatch, void, VkCommandBuffer, uint32_t, uint32_t, uint32_t);
VK_INSTANCE(vkCreateBuffer, VkResult, VkDevice, const VkBufferCreateInfo*, const VkAllocationCallbacks*, VkBuffer*);
VK_INSTANCE(vkCreateCommandPool, VkResult, VkDevice, const VkCommandPoolCreateInfo*, const VkAllocationCallbacks*,
VkCommandPool*);
VK_INSTANCE(vkCreateComputePipelines, VkResult, VkDevice, VkPipelineCache, uint32_t, const VkComputePipelineCreateInfo*,
const VkAllocationCallbacks*, VkPipeline*);
VK_INSTANCE(vkCreateDescriptorPool, VkResult, VkDevice, const VkDescriptorPoolCreateInfo*, const VkAllocationCallbacks*,
VkDescriptorPool*);
VK_INSTANCE(vkCreateDescriptorSetLayout, VkResult, VkDevice, const VkDescriptorSetLayoutCreateInfo*,
const VkAllocationCallbacks*, VkDescriptorSetLayout*);
VK_INSTANCE(vkCreateDevice, VkResult, VkPhysicalDevice, const VkDeviceCreateInfo*, const VkAllocationCallbacks*,
VkDevice*);
VK_INSTANCE(vkCreatePipelineLayout, VkResult, VkDevice, const VkPipelineLayoutCreateInfo*, const VkAllocationCallbacks*,
VkPipelineLayout*);
VK_INSTANCE(vkCreateShaderModule, VkResult, VkDevice, const VkShaderModuleCreateInfo*, const VkAllocationCallbacks*,
VkShaderModule*);
VK_INSTANCE(vkDestroyBuffer, void, VkDevice, VkBuffer, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyCommandPool, void, VkDevice, VkCommandPool, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyDescriptorPool, void, VkDevice, VkDescriptorPool, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyDescriptorSetLayout, void, VkDevice, VkDescriptorSetLayout, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyDevice, VkResult, VkDevice, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyInstance, void, VkInstance, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyPipeline, void, VkDevice, VkPipeline, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyPipelineLayout, void, VkDevice, VkPipelineLayout, const VkAllocationCallbacks*);
VK_INSTANCE(vkDestroyShaderModule, void, VkDevice, VkShaderModule, const VkAllocationCallbacks*);
VK_INSTANCE(vkCreateBuffer, VkResult, VkDevice, const VkBufferCreateInfo *, const VkAllocationCallbacks *, VkBuffer *);
VK_INSTANCE(vkCreateCommandPool, VkResult, VkDevice, const VkCommandPoolCreateInfo *, const VkAllocationCallbacks *,
VkCommandPool *);
VK_INSTANCE(vkCreateComputePipelines, VkResult, VkDevice, VkPipelineCache, uint32_t, const VkComputePipelineCreateInfo *,
const VkAllocationCallbacks *, VkPipeline *);
VK_INSTANCE(vkCreateDescriptorPool, VkResult, VkDevice, const VkDescriptorPoolCreateInfo *, const VkAllocationCallbacks *,
VkDescriptorPool *);
VK_INSTANCE(vkCreateDescriptorSetLayout, VkResult, VkDevice, const VkDescriptorSetLayoutCreateInfo *,
const VkAllocationCallbacks *, VkDescriptorSetLayout *);
VK_INSTANCE(vkCreateDevice, VkResult, VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *,
VkDevice *);
VK_INSTANCE(vkCreatePipelineLayout, VkResult, VkDevice, const VkPipelineLayoutCreateInfo *, const VkAllocationCallbacks *,
VkPipelineLayout *);
VK_INSTANCE(vkCreateShaderModule, VkResult, VkDevice, const VkShaderModuleCreateInfo *, const VkAllocationCallbacks *,
VkShaderModule *);
VK_INSTANCE(vkDestroyBuffer, void, VkDevice, VkBuffer, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyCommandPool, void, VkDevice, VkCommandPool, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyDescriptorPool, void, VkDevice, VkDescriptorPool, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyDescriptorSetLayout, void, VkDevice, VkDescriptorSetLayout, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyDevice, VkResult, VkDevice, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyInstance, void, VkInstance, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyPipeline, void, VkDevice, VkPipeline, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyPipelineLayout, void, VkDevice, VkPipelineLayout, const VkAllocationCallbacks *);
VK_INSTANCE(vkDestroyShaderModule, void, VkDevice, VkShaderModule, const VkAllocationCallbacks *);
VK_INSTANCE(vkEndCommandBuffer, VkResult, VkCommandBuffer);
VK_INSTANCE(vkEnumeratePhysicalDevices, VkResult, VkInstance, uint32_t*, VkPhysicalDevice*);
VK_INSTANCE(vkFreeCommandBuffers, void, VkDevice, VkCommandPool, uint32_t, const VkCommandBuffer*);
VK_INSTANCE(vkFreeMemory, void, VkDevice, VkDeviceMemory, const VkAllocationCallbacks*);
VK_INSTANCE(vkGetDeviceQueue, void, VkDevice, uint32_t, uint32_t, VkQueue*);
VK_INSTANCE(vkGetPhysicalDeviceMemoryProperties, void, VkPhysicalDevice, VkPhysicalDeviceMemoryProperties*);
VK_INSTANCE(vkGetPhysicalDeviceProperties, void, VkPhysicalDevice, VkPhysicalDeviceProperties*);
VK_INSTANCE(vkGetPhysicalDeviceProperties2, void, VkPhysicalDevice, VkPhysicalDeviceProperties2*);
VK_INSTANCE(vkGetPhysicalDeviceQueueFamilyProperties, void, VkPhysicalDevice, uint32_t*, VkQueueFamilyProperties*);
VK_INSTANCE(vkMapMemory, VkResult, VkDevice, VkDeviceMemory, VkDeviceSize, VkDeviceSize, VkMemoryMapFlags, void**);
VK_INSTANCE(vkQueueSubmit, VkResult, VkQueue, uint32_t, const VkSubmitInfo*, VkFence);
VK_INSTANCE(vkEnumeratePhysicalDevices, VkResult, VkInstance, uint32_t *, VkPhysicalDevice *);
VK_INSTANCE(vkFreeCommandBuffers, void, VkDevice, VkCommandPool, uint32_t, const VkCommandBuffer *);
VK_INSTANCE(vkFreeMemory, void, VkDevice, VkDeviceMemory, const VkAllocationCallbacks *);
VK_INSTANCE(vkGetDeviceQueue, void, VkDevice, uint32_t, uint32_t, VkQueue *);
VK_INSTANCE(vkGetPhysicalDeviceMemoryProperties, void, VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *);
VK_INSTANCE(vkGetPhysicalDeviceProperties, void, VkPhysicalDevice, VkPhysicalDeviceProperties *);
VK_INSTANCE(vkGetPhysicalDeviceProperties2, void, VkPhysicalDevice, VkPhysicalDeviceProperties2 *);
VK_INSTANCE(vkGetPhysicalDeviceQueueFamilyProperties, void, VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *);
VK_INSTANCE(vkMapMemory, VkResult, VkDevice, VkDeviceMemory, VkDeviceSize, VkDeviceSize, VkMemoryMapFlags, void **);
VK_INSTANCE(vkQueueSubmit, VkResult, VkQueue, uint32_t, const VkSubmitInfo *, VkFence);
VK_INSTANCE(vkQueueWaitIdle, VkResult, VkQueue);
VK_INSTANCE(vkUnmapMemory, void, VkDevice, VkDeviceMemory);
VK_INSTANCE(vkUpdateDescriptorSets, void, VkDevice, uint32_t, const VkWriteDescriptorSet*, uint32_t,
const VkCopyDescriptorSet*);
VK_INSTANCE(vkUpdateDescriptorSets, void, VkDevice, uint32_t, const VkWriteDescriptorSet *, uint32_t,
const VkCopyDescriptorSet *);
VK_INSTANCE(vkDeviceWaitIdle, VkResult, VkDevice);
\ No newline at end of file
tests/fuzzers/VertexRoutineFuzzer.cpp
......@@ -24,52 +24,60 @@
#include "Renderer/VertexProcessor.hpp"
#include "Shader/VertexProgram.hpp"
#include <cassert>
#include <cstdint>
#include <memory>
#include <cassert>
namespace {
// TODO(cwallez@google.com): Like in ANGLE, disable most of the pool allocator for fuzzing
// This is a helper class to make sure all the resources used by the compiler are initialized
class ScopedPoolAllocatorAndTLS {
public:
ScopedPoolAllocatorAndTLS() {
class ScopedPoolAllocatorAndTLS
{
public:
ScopedPoolAllocatorAndTLS()
{
InitializeParseContextIndex();
InitializePoolIndex();
SetGlobalPoolAllocator(&allocator);
}
~ScopedPoolAllocatorAndTLS() {
~ScopedPoolAllocatorAndTLS()
{
SetGlobalPoolAllocator(nullptr);
FreePoolIndex();
FreeParseContextIndex();
}
private:
private:
TPoolAllocator allocator;
};
// Trivial implementation of the glsl::Shader interface that fakes being an API-level
// shader object.
class FakeVS : public glsl::Shader {
public:
FakeVS(sw::VertexShader* bytecode) : bytecode(bytecode) {
class FakeVS : public glsl::Shader
{
public:
FakeVS(sw::VertexShader *bytecode)
: bytecode(bytecode)
{
}
sw::Shader *getShader() const override {
sw::Shader *getShader() const override
{
return bytecode;
}
sw::VertexShader *getVertexShader() const override {
sw::VertexShader *getVertexShader() const override
{
return bytecode;
}
private:
sw::VertexShader* bytecode;
private:
sw::VertexShader *bytecode;
};
} // anonymous namespace
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
// Data layout:
//
......@@ -125,8 +133,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
glslCompiler->Init(resources);
const char* glslSource = reinterpret_cast<const char*>(data + kHeaderSize);
if (!glslCompiler->compile(&glslSource, 1, SH_OBJECT_CODE))
const char *glslSource = reinterpret_cast<const char *>(data + kHeaderSize);
if(!glslCompiler->compile(&glslSource, 1, SH_OBJECT_CODE))
{
return 0;
}
......@@ -163,7 +171,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
for(int i = 0; i < sw::MAX_VERTEX_INPUTS; i++)
{
sw::StreamType type = (sw::StreamType)data[1 + 2 * i + 0];
Stream stream = (Stream&)data[1 + 2 * i + 1];
Stream stream = (Stream &)data[1 + 2 * i + 1];
if(type > sw::STREAMTYPE_LAST) return 0;
if(stream.count > MAX_ATTRIBUTE_COMPONENTS) return 0;
......@@ -206,7 +214,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
auto routine = program("VertexRoutine");
assert(routine);
const void *entry = routine->getEntry();
assert(entry); (void)entry;
assert(entry);
(void)entry;
return 0;
}
......@@ -219,7 +228,7 @@ int main(int argc, char *argv[])
fseek(file, 0L, SEEK_END);
long numbytes = ftell(file);
fseek(file, 0L, SEEK_SET);
uint8_t *buffer = (uint8_t*)calloc(numbytes, sizeof(uint8_t));
uint8_t *buffer = (uint8_t *)calloc(numbytes, sizeof(uint8_t));
fread(buffer, sizeof(char), numbytes, file);
fclose(file);
......
third_party/.clang-format 0 → 100644
---
Language: Cpp
DisableFormat: true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment