Linux build fix
On linux, clang is unable to find the Cast() function used in the
templated destroy() function unless it has already been defined
before the template function. This forces us to make sure all
Cast() functions are available, but simply adding the vulkan objects'
header files in VkMemory.h would cause a circular dependency, which,
while it would be properly guarded by the preprocessor directives,
wouldn't guarantee any include order, due to the nature of circular
dependencies. So, to fix the issue, a new header file, called
VkDestroy.h was added, which can depend on all vulkan objects' header
files without creating a circular dependency.
Also fixed some warnings.
Change-Id: I1f343a8c476d6308d4555009848a234b0695661e
Reviewed-on: https://swiftshader-review.googlesource.com/c/21668
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Vulkan/VkDestroy.h b/src/Vulkan/VkDestroy.h
new file mode 100644
index 0000000..f45ebcd
--- /dev/null
+++ b/src/Vulkan/VkDestroy.h
@@ -0,0 +1,45 @@
+// Copyright 2018 The SwiftShader Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "VkCommandBuffer.hpp"
+#include "VkDevice.hpp"
+#include "VkInstance.hpp"
+#include "VkPhysicalDevice.hpp"
+#include "VkQueue.hpp"
+
+namespace vk
+{
+
+// Because Vulkan uses optional allocation callbacks, we use them in a custom
+// placement new operator in the VkObjectBase class for simplicity.
+// Unfortunately, since we use a placement new to allocate VkObjectBase derived
+// classes objects, the corresponding deletion operator is a placement delete,
+// which does nothing. In order to properly dispose of these objects' memory,
+// we use this function, which calls the proper T:destroy() function
+// prior to releasing the object (by default, VkObjectBase::destroy does nothing).
+template<typename VkT>
+inline void destroy(VkT vkObject, const VkAllocationCallbacks* pAllocator)
+{
+ auto object = Cast(vkObject);
+ if(object)
+ {
+ object->destroy(pAllocator);
+ // object may not point to the same pointer as vkObject, for dispatchable objects,
+ // for example, so make sure to deallocate based on the vkObject pointer, which
+ // should always point to the beginning of the allocated memory
+ vk::deallocate(vkObject, pAllocator);
+ }
+}
+
+}
diff --git a/src/Vulkan/VkDevice.cpp b/src/Vulkan/VkDevice.cpp
index 62040db..2389fda 100644
--- a/src/Vulkan/VkDevice.cpp
+++ b/src/Vulkan/VkDevice.cpp
@@ -27,7 +27,7 @@
for(uint32_t i = 0; i < pCreateInfo->queueCreateInfoCount; i++)
{
const VkDeviceQueueCreateInfo& queueCreateInfo = pCreateInfo->pQueueCreateInfos[i];
- queueCount += info->pCreateInfo->pQueueCreateInfos[i].queueCount;
+ queueCount += queueCreateInfo.queueCount;
}
uint32_t queueID = 0;
diff --git a/src/Vulkan/VkInstance.cpp b/src/Vulkan/VkInstance.cpp
index 1848064..c0b9bba 100644
--- a/src/Vulkan/VkInstance.cpp
+++ b/src/Vulkan/VkInstance.cpp
@@ -13,6 +13,7 @@
// limitations under the License.
#include "VkInstance.hpp"
+#include "VkDestroy.h"
namespace vk
{
diff --git a/src/Vulkan/VkInstance.hpp b/src/Vulkan/VkInstance.hpp
index d5385ae..30c48b9 100644
--- a/src/Vulkan/VkInstance.hpp
+++ b/src/Vulkan/VkInstance.hpp
@@ -15,7 +15,7 @@
#ifndef VK_INSTANCE_HPP_
#define VK_INSTANCE_HPP_
-#include "VkPhysicalDevice.hpp"
+#include "VkObject.hpp"
namespace vk
{
diff --git a/src/Vulkan/VkMemory.cpp b/src/Vulkan/VkMemory.cpp
index f24be3c..769b0db 100644
--- a/src/Vulkan/VkMemory.cpp
+++ b/src/Vulkan/VkMemory.cpp
@@ -17,6 +17,7 @@
#include "VkConfig.h"
#include "VkMemory.h"
+#include "System/Memory.hpp"
namespace vk
{
diff --git a/src/Vulkan/VkMemory.h b/src/Vulkan/VkMemory.h
index 4178209..29309b7 100644
--- a/src/Vulkan/VkMemory.h
+++ b/src/Vulkan/VkMemory.h
@@ -15,14 +15,13 @@
#ifndef VK_MEMORY_HPP_
#define VK_MEMORY_HPP_
-#include "System/Memory.hpp"
#include <vulkan/vulkan.h>
namespace vk
{
void* allocate(size_t count, size_t alignment, const VkAllocationCallbacks* pAllocator,
- VkSystemAllocationScope allocationScope = VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+ VkSystemAllocationScope allocationScope = VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
void deallocate(void* ptr, const VkAllocationCallbacks* pAllocator);
template <typename T>
@@ -31,27 +30,6 @@
return reinterpret_cast<T*>(allocate(count, alignof(T), pAllocator, T::GetAllocationScope()));
}
-// Because Vulkan uses optional allocation callbacks, we use them in a custom
-// placement new operator in the VkObjectBase class for simplicity.
-// Unfortunately, since we use a placement new to allocate VkObjectBase derived
-// classes objects, the corresponding deletion operator is a placement delete,
-// which does nothing. In order to properly dispose of these objects' memory,
-// we use this function, which calls the proper T:destroy() function
-// prior to releasing the object (by default, VkObjectBase::destroy does nothing).
-template<typename VkT>
-inline void destroy(VkT vkObject, const VkAllocationCallbacks* pAllocator)
-{
- auto object = Cast(vkObject);
- if(object)
- {
- object->destroy(pAllocator);
- // object may not point to the same pointer as vkObject, for dispatchable objects,
- // for example, so make sure to deallocate based on the vkObject pointer, which
- // should always point to the beginning of the allocated memory
- vk::deallocate(vkObject, pAllocator);
- }
-}
-
} // namespace vk
-#endif // VK_MEMORY_HPP_
\ No newline at end of file
+#endif // VK_MEMORY_HPP_
diff --git a/src/Vulkan/VkObject.hpp b/src/Vulkan/VkObject.hpp
index 84349da..5a9a414 100644
--- a/src/Vulkan/VkObject.hpp
+++ b/src/Vulkan/VkObject.hpp
@@ -15,6 +15,7 @@
#ifndef VK_OBJECT_HPP_
#define VK_OBJECT_HPP_
+#include "VkConfig.h"
#include "VkDebug.hpp"
#include "VkMemory.h"
#include <vulkan/vulkan.h>
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 88b0570..90ba1dc 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -215,6 +215,7 @@
uint32_t apiVersion;
VkResult result = vkEnumerateInstanceVersion(&apiVersion);
ASSERT(result == VK_SUCCESS);
+ (void)result; // Slence unused variable warning
static const VkPhysicalDeviceProperties properties
{
@@ -382,4 +383,4 @@
return properties;
}
-} // namespace vk
\ No newline at end of file
+} // namespace vk
diff --git a/src/Vulkan/VkQueue.hpp b/src/Vulkan/VkQueue.hpp
index cb6517f..49e2604 100644
--- a/src/Vulkan/VkQueue.hpp
+++ b/src/Vulkan/VkQueue.hpp
@@ -16,6 +16,7 @@
#define VK_QUEUE_HPP_
#include "VkObject.hpp"
+#include <vulkan/vk_icd.h>
namespace vk
{
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 5fe4559..b5bd7f6 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -15,6 +15,7 @@
#include "VkConfig.h"
#include "VkCommandBuffer.hpp"
#include "VkDebug.hpp"
+#include "VkDestroy.h"
#include "VkDevice.hpp"
#include "VkGetProcAddress.h"
#include "VkInstance.hpp"
@@ -222,6 +223,7 @@
}
ASSERT(queueCreateInfo.queueFamilyIndex < queueFamilyPropertyCount);
+ (void)queueFamilyPropertyCount; // Slence unused variable warning
}
vk::Device::CreateInfo deviceCreateInfo =
diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index 92b83df..ce9f4a4 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -100,6 +100,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -120,6 +121,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<ModuleDefinitionFile>swiftshader_icd.def</ModuleDefinitionFile>
@@ -138,6 +140,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<ModuleDefinitionFile>swiftshader_icd.def</ModuleDefinitionFile>
@@ -158,6 +161,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -270,6 +274,7 @@
<ClInclude Include="VkCommandBuffer.hpp" />
<ClInclude Include="VkConfig.h" />
<ClInclude Include="VkDebug.hpp" />
+ <ClInclude Include="VkDestroy.h" />
<ClInclude Include="VkDevice.hpp" />
<ClInclude Include="VkGetProcAddress.h" />
<ClInclude Include="VkInstance.hpp" />
diff --git a/src/Vulkan/vulkan.vcxproj.filters b/src/Vulkan/vulkan.vcxproj.filters
index 2d6ed035..1317185 100644
--- a/src/Vulkan/vulkan.vcxproj.filters
+++ b/src/Vulkan/vulkan.vcxproj.filters
@@ -461,6 +461,9 @@
<ClInclude Include="VkDebug.hpp">
<Filter>Header Files\Vulkan</Filter>
</ClInclude>
+ <ClInclude Include="VkDestroy.h">
+ <Filter>Header Files\Vulkan</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="swiftshader_icd.def" />
