Rename Vulkan-source .h to .hpp

src/Device/Blitter.hpp

@@ -18,7 +18,7 @@
 #include "Memset.hpp"
 #include "RoutineCache.hpp"
 #include "Reactor/Reactor.hpp"
-#include "Vulkan/VkFormat.h"
+#include "Vulkan/VkFormat.hpp"
 
 #include "marl/mutex.h"
 #include "marl/tsa.h"

src/Device/Context.hpp

@@ -19,7 +19,7 @@
 #include "Memset.hpp"
 #include "Stream.hpp"
 #include "System/Types.hpp"
-#include "Vulkan/VkConfig.h"
+#include "Vulkan/VkConfig.hpp"
 #include "Vulkan/VkDescriptorSet.hpp"
 
 namespace vk {

src/Device/Renderer.cpp

@@ -26,7 +26,7 @@
 #include "System/Math.hpp"
 #include "System/Memory.hpp"
 #include "System/Timer.hpp"
-#include "Vulkan/VkConfig.h"
+#include "Vulkan/VkConfig.hpp"
 #include "Vulkan/VkDevice.hpp"
 #include "Vulkan/VkFence.hpp"
 #include "Vulkan/VkImageView.hpp"

src/Device/Sampler.hpp

@@ -17,7 +17,7 @@
 
 #include "Device/Config.hpp"
 #include "System/Types.hpp"
-#include "Vulkan/VkFormat.h"
+#include "Vulkan/VkFormat.hpp"
 
 namespace vk {
 class Image;

src/Device/Stream.hpp

@@ -15,7 +15,7 @@
 #ifndef sw_Stream_hpp
 #define sw_Stream_hpp
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace sw {
 

src/Pipeline/Constants.hpp

@@ -17,7 +17,7 @@
 
 #include "System/Math.hpp"
 #include "System/Types.hpp"
-#include "Vulkan/VkConfig.h"
+#include "Vulkan/VkConfig.hpp"
 
 namespace sw {
 

src/Pipeline/SpirvShader.hpp

@@ -23,7 +23,7 @@
 #include "System/Debug.hpp"
 #include "System/Math.hpp"
 #include "System/Types.hpp"
-#include "Vulkan/VkConfig.h"
+#include "Vulkan/VkConfig.hpp"
 #include "Vulkan/VkDescriptorSet.hpp"
 
 #define SPV_ENABLE_UTILITY_CODE

src/Reactor/SubmoduleCheck/gtest/gtest.h

-// Copyright 2019 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.
-
-// These are not the headers you're looking for
-#error "Missing googletest submodule. Run git submodule update --init"
\ No newline at end of file

src/Vulkan/BUILD.gn

@@ -58,28 +58,28 @@ config("swiftshader_libvulkan_private_config") {
 
 swiftshader_source_set("swiftshader_libvulkan_headers") {
   sources = [
-    "Version.h",
+    "Version.hpp",
     "VkBuffer.hpp",
     "VkBufferView.hpp",
     "VkCommandBuffer.hpp",
     "VkCommandPool.hpp",
-    "VkConfig.h",
+    "VkConfig.hpp",
     "VkDescriptorPool.hpp",
     "VkDescriptorSet.hpp",
     "VkDescriptorSetLayout.hpp",
     "VkDescriptorUpdateTemplate.hpp",
-    "VkDestroy.h",
+    "VkDestroy.hpp",
     "VkDevice.hpp",
     "VkDeviceMemory.hpp",
     "VkEvent.hpp",
     "VkFence.hpp",
-    "VkFormat.h",
+    "VkFormat.hpp",
     "VkFramebuffer.hpp",
-    "VkGetProcAddress.h",
+    "VkGetProcAddress.hpp",
     "VkImage.hpp",
     "VkImageView.hpp",
     "VkInstance.hpp",
-    "VkMemory.h",
+    "VkMemory.hpp",
     "VkObject.hpp",
     "VkPhysicalDevice.hpp",
     "VkPipeline.hpp",
@@ -93,7 +93,7 @@ swiftshader_source_set("swiftshader_libvulkan_headers") {
     "VkShaderModule.hpp",
     "VkSpecializationInfo.hpp",
     "VkStringify.hpp",
-    "VulkanPlatform.h",
+    "VulkanPlatform.hpp",
   ]
   if (is_linux || is_android) {
     sources += [

src/Vulkan/CMakeLists.txt

@@ -21,7 +21,7 @@ set(VULKAN_SRC_FILES
     libVulkan.cpp
     main.cpp
     resource.h
-    Version.h
+    Version.hpp
     VkBuffer.cpp
     VkBuffer.hpp
     VkBufferView.cpp
@@ -30,7 +30,7 @@ set(VULKAN_SRC_FILES
     VkCommandBuffer.hpp
     VkCommandPool.cpp
     VkCommandPool.hpp
-    VkConfig.h
+    VkConfig.hpp
     VkDescriptorPool.cpp
     VkDescriptorPool.hpp
     VkDescriptorSet.hpp
@@ -38,7 +38,7 @@ set(VULKAN_SRC_FILES
     VkDescriptorSetLayout.hpp
     VkDescriptorUpdateTemplate.cpp
     VkDescriptorUpdateTemplate.hpp
-    VkDestroy.h
+    VkDestroy.hpp
     VkDevice.cpp
     VkDevice.hpp
     VkDeviceMemory.cpp
@@ -48,11 +48,11 @@ set(VULKAN_SRC_FILES
     VkEvent.hpp
     VkFence.hpp
     VkFormat.cpp
-    VkFormat.h
+    VkFormat.hpp
     VkFramebuffer.cpp
     VkFramebuffer.hpp
     VkGetProcAddress.cpp
-    VkGetProcAddress.h
+    VkGetProcAddress.hpp
     VkImage.cpp
     VkImage.hpp
     VkImageView.cpp
@@ -60,7 +60,7 @@ set(VULKAN_SRC_FILES
     VkInstance.cpp
     VkInstance.hpp
     VkMemory.cpp
-    VkMemory.h
+    VkMemory.hpp
     VkObject.hpp
     VkPhysicalDevice.cpp
     VkPhysicalDevice.hpp
@@ -89,7 +89,7 @@ set(VULKAN_SRC_FILES
     VkShaderModule.hpp
     VkStringify.cpp
     VkStringify.hpp
-    VulkanPlatform.h
+    VulkanPlatform.hpp
 )
 
 if(WIN32)

src/Vulkan/VkBuffer.cpp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "VkBuffer.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDeviceMemory.hpp"
 
 #include <cstring>

src/Vulkan/VkBufferView.cpp

@@ -14,7 +14,7 @@
 
 #include "VkBufferView.hpp"
 #include "VkBuffer.hpp"
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 
 namespace vk {
 

src/Vulkan/VkBufferView.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_BUFFER_VIEW_HPP_
 #define VK_BUFFER_VIEW_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkImageView.hpp"
 #include "VkObject.hpp"
 

src/Vulkan/VkCommandBuffer.cpp

@@ -15,7 +15,7 @@
 #include "VkCommandBuffer.hpp"
 
 #include "VkBuffer.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDevice.hpp"
 #include "VkEvent.hpp"
 #include "VkFence.hpp"

src/Vulkan/VkCommandBuffer.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_COMMAND_BUFFER_HPP_
 #define VK_COMMAND_BUFFER_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSet.hpp"
 #include "VkObject.hpp"
 #include "Device/Context.hpp"

src/Vulkan/VkCommandPool.cpp

@@ -14,7 +14,7 @@
 
 #include "VkCommandPool.hpp"
 #include "VkCommandBuffer.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 #include <algorithm>
 #include <new>
 

src/Vulkan/VkConfig.h → src/Vulkan/VkConfig.hpp

@@ -15,9 +15,9 @@
 #ifndef VK_CONFIG_HPP_
 #define VK_CONFIG_HPP_
 
-#include "Version.h"
+#include "Version.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 

src/Vulkan/VkDevice.cpp

@@ -14,7 +14,7 @@
 
 #include "VkDevice.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSetLayout.hpp"
 #include "VkFence.hpp"
 #include "VkQueue.hpp"

src/Vulkan/VkDeviceMemory.cpp

@@ -16,7 +16,7 @@
 #include "VkBuffer.hpp"
 #include "VkImage.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 
 namespace vk {
 

src/Vulkan/VkDeviceMemory.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_DEVICE_MEMORY_HPP_
 #define VK_DEVICE_MEMORY_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkObject.hpp"
 
 namespace vk {

src/Vulkan/VkFormat.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 
 #include "System/Debug.hpp"
 #include "System/Math.hpp"

src/Vulkan/VkFormat.h → src/Vulkan/VkFormat.hpp

@@ -17,7 +17,7 @@
 
 #include "System/Types.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 

src/Vulkan/VkGetProcAddress.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VkGetProcAddress.h"
+#include "VkGetProcAddress.hpp"
 #include "VkDevice.hpp"
 
 #include <string>

src/Vulkan/VkGetProcAddress.h → src/Vulkan/VkGetProcAddress.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_UTILS_HPP_
 #define VK_UTILS_HPP_
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 

src/Vulkan/VkImage.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_IMAGE_HPP_
 #define VK_IMAGE_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkObject.hpp"
 
 #ifdef __ANDROID__

src/Vulkan/VkImageView.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_IMAGE_VIEW_HPP_
 #define VK_IMAGE_VIEW_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkImage.hpp"
 #include "VkObject.hpp"
 

src/Vulkan/VkInstance.cpp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "VkInstance.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 
 namespace vk {
 

src/Vulkan/VkMemory.cpp

@@ -15,9 +15,9 @@
 #ifndef VK_OBJECT_HPP_
 #define VK_OBJECT_HPP_
 
-#include "VkMemory.h"
+#include "VkMemory.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "System/Memory.hpp"
 
 namespace vk {

src/Vulkan/VkMemory.h → src/Vulkan/VkMemory.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_MEMORY_HPP_
 #define VK_MEMORY_HPP_
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 namespace vk {
 

src/Vulkan/VkObject.hpp

@@ -15,12 +15,12 @@
 #ifndef VK_OBJECT_HPP_
 #define VK_OBJECT_HPP_
 
-#include "VkConfig.h"
-#include "VkMemory.h"
+#include "VkConfig.hpp"
+#include "VkMemory.hpp"
 
 #include "System/Debug.hpp"
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 #include <vulkan/vk_icd.h>
 #include <new>
 

src/Vulkan/VkPhysicalDevice.cpp

@@ -14,7 +14,7 @@
 
 #include "VkPhysicalDevice.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "Pipeline/SpirvShader.hpp"  // sw::SIMD::Width
 #include "Reactor/Reactor.hpp"
 

src/Vulkan/VkPhysicalDevice.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_PHYSICAL_DEVICE_HPP_
 #define VK_PHYSICAL_DEVICE_HPP_
 
-#include "VkFormat.h"
+#include "VkFormat.hpp"
 #include "VkObject.hpp"
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR

src/Vulkan/VkPipelineLayout.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_PIPELINE_LAYOUT_HPP_
 #define VK_PIPELINE_LAYOUT_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorSetLayout.hpp"
 
 namespace vk {

src/Vulkan/VkPromotedExtensions.cpp

@@ -40,7 +40,7 @@
 // VK_KHR_storage_buffer_storage_class (no functions in this extension)
 // VK_KHR_variable_pointers (no functions in this extension)
 
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 extern "C" {
 

src/Vulkan/VkSemaphore.cpp

@@ -14,7 +14,7 @@
 
 #include "VkSemaphore.hpp"
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkStringify.hpp"
 
 #include "marl/blockingcall.h"

src/Vulkan/VkSemaphore.hpp

@@ -15,7 +15,7 @@
 #ifndef VK_SEMAPHORE_HPP_
 #define VK_SEMAPHORE_HPP_
 
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkObject.hpp"
 
 #include "marl/event.h"

src/Vulkan/Vulkan.rc

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
-#include "Version.h"
+#include "Version.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -36,7 +36,7 @@ END
 2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
-    "#include ""Version.h""\0"
+    "#include ""Version.hpp""\0"
 END
 
 3 TEXTINCLUDE

src/Vulkan/libVulkan.cpp

@@ -16,17 +16,17 @@
 #include "VkBufferView.hpp"
 #include "VkCommandBuffer.hpp"
 #include "VkCommandPool.hpp"
-#include "VkConfig.h"
+#include "VkConfig.hpp"
 #include "VkDescriptorPool.hpp"
 #include "VkDescriptorSetLayout.hpp"
 #include "VkDescriptorUpdateTemplate.hpp"
-#include "VkDestroy.h"
+#include "VkDestroy.hpp"
 #include "VkDevice.hpp"
 #include "VkDeviceMemory.hpp"
 #include "VkEvent.hpp"
 #include "VkFence.hpp"
 #include "VkFramebuffer.hpp"
-#include "VkGetProcAddress.h"
+#include "VkGetProcAddress.hpp"
 #include "VkImage.hpp"
 #include "VkImageView.hpp"
 #include "VkInstance.hpp"
@@ -45,7 +45,7 @@
 #include "System/Debug.hpp"
 
 #if defined(VK_USE_PLATFORM_METAL_EXT) || defined(VK_USE_PLATFORM_MACOS_MVK)
-#	include "WSI/MetalSurface.h"
+#	include "WSI/MetalSurface.hpp"
 #endif
 
 #ifdef VK_USE_PLATFORM_XCB_KHR

src/WSI/BUILD.gn

@@ -51,7 +51,7 @@ swiftshader_source_set("WSI") {
 
   if (is_mac) {
     sources += [
-      "MetalSurface.h",
+      "MetalSurface.hpp",
       "MetalSurface.mm",
     ]
     libs = [

src/WSI/CMakeLists.txt

@@ -49,7 +49,7 @@ elseif(LINUX)
 elseif(APPLE)
     list(APPEND WSI_SRC_FILES
         MetalSurface.mm
-        MetalSurface.h
+        MetalSurface.hpp
     )
 endif()
 

src/WSI/MetalSurface.mm

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "MetalSurface.h"
+#include "MetalSurface.hpp"
 #include "Vulkan/VkDeviceMemory.hpp"
 #include "Vulkan/VkImage.hpp"
 

src/WSI/VkSurfaceKHR.cpp

@@ -14,7 +14,7 @@
 
 #include "VkSurfaceKHR.hpp"
 
-#include "Vulkan/VkDestroy.h"
+#include "Vulkan/VkDestroy.hpp"
 
 #include <algorithm>
 

src/WSI/VkSurfaceKHR.hpp

@@ -17,7 +17,7 @@
 
 #include "Vulkan/VkImage.hpp"
 #include "Vulkan/VkObject.hpp"
-#include <Vulkan/VulkanPlatform.h>
+#include "Vulkan/VulkanPlatform.hpp"
 
 #include <vector>