Skip to content

S
swiftshader
Commit 2490b1ae by Nicolas Capens Committed by Nicolas Capens
Options

Undefine Bool after the headers that define them

X11/Xlib.h defines Bool as a macro, which clashes with Reactor's Bool class. This X11 header is also included by vulkan.h, vk_icd.h, and EGL/eglplatform.h Previously we undefined Bool in various places. It's not possible to just undefine it in Reactor.hpp because one can have headers following the inclusion of Reactor.hpp which redefine it (note our convention is to include platform headers after project headers). Since X11 is only needed in select places related to the windowing system, we can instead avoid the use of these headers in other headers, and only include them in .cpp files where necessary. Note that vulkan_core.h contains the whole plaform-independent Vulkan API, so it should be used instead of vulkan.h for all non-WSI code. Bug: b/127920555 Change-Id: Id11a1c58b87802fe9e530387831693e44accae2b Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46368 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent cd0af645
Showing with 29 additions and 57 deletions
include/vulkan/vk_ext_provoking_vertex.h
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "vulkan.h" #include "vulkan_core.h"
// THIS FILE SHOULD BE DELETED IF VK_EXT_provoking_vertex IS EVER ADDED TO THE VULKAN HEADERS // THIS FILE SHOULD BE DELETED IF VK_EXT_provoking_vertex IS EVER ADDED TO THE VULKAN HEADERS
#ifdef VK_EXT_provoking_vertex #ifdef VK_EXT_provoking_vertex
......
src/Main/libX11.cpp
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "Common/SharedLibrary.hpp" #include "Common/SharedLibrary.hpp"
#define Bool int
LibX11exports::LibX11exports(void *libX11, void *libXext) LibX11exports::LibX11exports(void *libX11, void *libXext)
{ {
XOpenDisplay = (Display *(*)(char*))getProcAddress(libX11, "XOpenDisplay"); XOpenDisplay = (Display *(*)(char*))getProcAddress(libX11, "XOpenDisplay");
......
src/Main/libX11.hpp
...@@ -48,8 +48,6 @@ struct LibX11exports ...@@ -48,8 +48,6 @@ struct LibX11exports
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); 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
class LibX11 class LibX11
{ {
public: public:
......
src/OpenGL/common/Surface.hpp
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "Renderer/Surface.hpp" #include "Renderer/Surface.hpp"
#include <EGL/egl.h> #include <EGL/egl.h>
#undef Bool
namespace egl namespace egl
{ {
......
src/OpenGL/libEGL/Context.hpp
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#include "Renderer/Surface.hpp" #include "Renderer/Surface.hpp"
#include <EGL/egl.h> #include <EGL/egl.h>
#undef Bool
#include <GLES/gl.h> #include <GLES/gl.h>
namespace gl { class Surface; } namespace gl { class Surface; }
......
src/Pipeline/SamplerCore.hpp
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
#include "Reactor/Print.hpp" #include "Reactor/Print.hpp"
#include "Reactor/Reactor.hpp" #include "Reactor/Reactor.hpp"
#ifdef None
# undef None // b/127920555
#endif
namespace sw { namespace sw {
using namespace rr; using namespace rr;
......
src/Reactor/Reactor.hpp
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <tuple> #include <tuple>
#include <unordered_set> #include <unordered_set>
#undef Bool // b/127920555
#ifdef ENABLE_RR_DEBUG_INFO #ifdef ENABLE_RR_DEBUG_INFO
// Functions used for generating JIT debug info. // Functions used for generating JIT debug info.
// See docs/ReactorDebugInfo.md for more information. // See docs/ReactorDebugInfo.md for more information.
......
src/Reactor/Traits.hpp
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
#include <stdint.h> #include <stdint.h>
#include <type_traits> #include <type_traits>
#ifdef Bool
# undef Bool // b/127920555
#endif
namespace rr { namespace rr {
// Forward declarations // Forward declarations
......
src/Vulkan/VkDescriptorSet.hpp
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
#ifndef VK_DESCRIPTOR_SET_HPP_ #ifndef VK_DESCRIPTOR_SET_HPP_
#define VK_DESCRIPTOR_SET_HPP_ #define VK_DESCRIPTOR_SET_HPP_
// Intentionally not including VkObject.hpp here due to b/127920555 #include "VkObject.hpp"
#include "VkConfig.hpp"
#include "marl/mutex.h" #include "marl/mutex.h"
#include <array> #include <array>
...@@ -35,19 +33,9 @@ struct alignas(16) DescriptorSetHeader ...@@ -35,19 +33,9 @@ struct alignas(16) DescriptorSetHeader
marl::mutex mutex; marl::mutex mutex;
}; };
class alignas(16) DescriptorSet class alignas(16) DescriptorSet : public Object<DescriptorSet, VkDescriptorSet>
{ {
public: public:
static inline DescriptorSet *Cast(VkDescriptorSet object)
{
return static_cast<DescriptorSet *>(static_cast<void *>(object));
}
operator VkDescriptorSet()
{
return { static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this)) };
}
using Array = std::array<DescriptorSet *, vk::MAX_BOUND_DESCRIPTOR_SETS>; using Array = std::array<DescriptorSet *, vk::MAX_BOUND_DESCRIPTOR_SETS>;
using Bindings = std::array<uint8_t *, vk::MAX_BOUND_DESCRIPTOR_SETS>; using Bindings = std::array<uint8_t *, vk::MAX_BOUND_DESCRIPTOR_SETS>;
using DynamicOffsets = std::array<uint32_t, vk::MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC>; using DynamicOffsets = std::array<uint32_t, vk::MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC>;
......
src/Vulkan/VkObject.hpp
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
#include "System/Debug.hpp" #include "System/Debug.hpp"
#include "Vulkan/VulkanPlatform.hpp"
#include <vulkan/vk_icd.h> #include <vulkan/vk_icd.h>
#undef None
#undef Bool
#include <new> #include <new>
namespace vk { namespace vk {
......
src/Vulkan/VkQueue.hpp
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
#include "VkObject.hpp" #include "VkObject.hpp"
#include "Device/Renderer.hpp" #include "Device/Renderer.hpp"
#include <vulkan/vk_icd.h>
#include <thread>
#include "System/Synchronization.hpp" #include "System/Synchronization.hpp"
#include <thread>
namespace marl { namespace marl {
class Scheduler; class Scheduler;
} }
......
src/Vulkan/VkStringify.cpp
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "System/Debug.hpp" #include "System/Debug.hpp"
#include "vulkan/vk_ext_provoking_vertex.h" #include <vulkan/vk_ext_provoking_vertex.h>
#include "vulkan/vk_google_filtering_precision.h" #include <vulkan/vk_google_filtering_precision.h>
#include <iostream> #include <iostream>
#include <map> #include <map>
......
src/Vulkan/VkStringify.hpp
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#ifndef VK_STRINGIFY_HPP_ #ifndef VK_STRINGIFY_HPP_
#define VK_STRINGIFY_HPP_ #define VK_STRINGIFY_HPP_
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <string> #include <string>
namespace vk { namespace vk {
......
src/Vulkan/VulkanPlatform.hpp
...@@ -27,8 +27,8 @@ public: ...@@ -27,8 +27,8 @@ public:
{ {
static_assert(sizeof(VkNonDispatchableHandle) == sizeof(uint64_t), "Size is not 64 bits!"); static_assert(sizeof(VkNonDispatchableHandle) == sizeof(uint64_t), "Size is not 64 bits!");
// VkNonDispatchabbleHandle must be POD to ensure it gets passed by value the same way as a uint64_t, // VkNonDispatchableHandle must be POD to ensure it gets passed by value the same way as a uint64_t,
// which is the upstream header's handle type when compiled for 32b architectures. On 64b architectures, // which is the upstream header's handle type when compiled for 32-bit architectures. On 64-bit architectures,
// the upstream header's handle type is a pointer type. // the upstream header's handle type is a pointer type.
static_assert(std::is_trivial<VkNonDispatchableHandle<T>>::value, "VkNonDispatchableHandle<T> is not trivial!"); static_assert(std::is_trivial<VkNonDispatchableHandle<T>>::value, "VkNonDispatchableHandle<T> is not trivial!");
static_assert(std::is_standard_layout<VkNonDispatchableHandle<T>>::value, "VkNonDispatchableHandle<T> is not standard layout!"); static_assert(std::is_standard_layout<VkNonDispatchableHandle<T>>::value, "VkNonDispatchableHandle<T> is not standard layout!");
...@@ -51,12 +51,7 @@ public: ...@@ -51,12 +51,7 @@ public:
#include <vulkan/vk_ext_provoking_vertex.h> #include <vulkan/vk_ext_provoking_vertex.h>
#include <vulkan/vk_google_filtering_precision.h> #include <vulkan/vk_google_filtering_precision.h>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#ifdef Bool
# undef Bool // b/127920555
# undef None
#endif
namespace vk { namespace vk {
// Here we define constants that used to be in the Vulkan headers, but are not part of the spec. // Here we define constants that used to be in the Vulkan headers, but are not part of the spec.
......
src/WSI/MetalSurface.hpp
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
#include "VkSurfaceKHR.hpp" #include "VkSurfaceKHR.hpp"
#include "Vulkan/VkObject.hpp" #include "Vulkan/VkObject.hpp"
#ifdef VK_USE_PLATFORM_MACOS_MVK #ifdef VK_USE_PLATFORM_MACOS_MVK
# include "vulkan/vulkan_macos.h" # include <vulkan/vulkan_macos.h>
#endif #endif
#ifdef VK_USE_PLATFORM_METAL_EXT #ifdef VK_USE_PLATFORM_METAL_EXT
# include "vulkan/vulkan_metal.h" # include <vulkan/vulkan_metal.h>
#endif #endif
namespace vk { namespace vk {
......
src/WSI/Win32SurfaceKHR.hpp
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#if !defined(WIN32_LEAN_AND_MEAN) #if !defined(WIN32_LEAN_AND_MEAN)
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif // !defined(WIN32_LEAN_AND_MEAN) #endif // !defined(WIN32_LEAN_AND_MEAN)
#include "vulkan/vulkan_win32.h"
#include <Windows.h> #include <Windows.h>
#include <vulkan/vulkan_win32.h>
#include <map> #include <map>
......
src/WSI/XcbSurfaceKHR.hpp
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
#include "VkSurfaceKHR.hpp" #include "VkSurfaceKHR.hpp"
#include "Vulkan/VkObject.hpp" #include "Vulkan/VkObject.hpp"
#include "vulkan/vulkan_xcb.h"
#include <vulkan/vulkan_xcb.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <unordered_map> #include <unordered_map>
......
src/WSI/XlibSurfaceKHR.hpp
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
#include "VkSurfaceKHR.hpp" #include "VkSurfaceKHR.hpp"
#include "libX11.hpp" #include "libX11.hpp"
#include "Vulkan/VkObject.hpp" #include "Vulkan/VkObject.hpp"
#include "vulkan/vulkan_xlib.h"
#include <vulkan/vulkan_xlib.h>
#include <unordered_map> #include <unordered_map>
......
src/WSI/libX11.cpp
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "System/SharedLibrary.hpp" #include "System/SharedLibrary.hpp"
#define Bool int
namespace { namespace {
template<typename FPTR> template<typename FPTR>
......
src/WSI/libX11.hpp
...@@ -49,8 +49,6 @@ struct LibX11exports ...@@ -49,8 +49,6 @@ struct LibX11exports
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); 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
class LibX11 class LibX11
{ {
public: public:
......
tests/SystemBenchmarks/LRUCacheBenchmarks.cpp
...@@ -160,7 +160,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheHit) ...@@ -160,7 +160,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheHit)
ComplexKey key; ComplexKey key;
for(size_t w = 0; w < key.words.size(); w++) for(size_t w = 0; w < key.words.size(); w++)
{ {
key.words[w] = (1U << w); key.words[w] = (1ull << w);
} }
cache.add(key, i); cache.add(key, i);
} }
...@@ -172,7 +172,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheHit) ...@@ -172,7 +172,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheHit)
ComplexKey key; ComplexKey key;
for(size_t w = 0; w < key.words.size(); w++) for(size_t w = 0; w < key.words.size(); w++)
{ {
key.words[w] = i & (1U << w); key.words[w] = i & (1ull << w);
} }
cache.lookup(key); cache.lookup(key);
} }
...@@ -190,7 +190,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheMiss) ...@@ -190,7 +190,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheMiss)
ComplexKey key; ComplexKey key;
for(size_t w = 0; w < key.words.size(); w++) for(size_t w = 0; w < key.words.size(); w++)
{ {
key.words[w] = 8 + (1U << w); key.words[w] = 8 + (1ull << w);
} }
cache.add(key, i); cache.add(key, i);
} }
...@@ -202,7 +202,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheMiss) ...@@ -202,7 +202,7 @@ BENCHMARK_DEFINE_F(LRUCacheBenchmark, GetComplexKeyCacheMiss)
ComplexKey key; ComplexKey key;
for(size_t w = 0; w < key.words.size(); w++) for(size_t w = 0; w < key.words.size(); w++)
{ {
key.words[w] = i & (1U << w); key.words[w] = i & (1ull << w);
} }
cache.lookup(key); cache.lookup(key);
} }
......
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