Skip to content

Rename platform headers. #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2023
Merged

Rename platform headers. #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gpgmm/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ source_set("gpgmm_sources") {
"d3d12/BufferAllocatorD3D12.h",
"d3d12/CapsD3D12.cpp",
"d3d12/CapsD3D12.h",
"d3d12/D3D12Platform.h",
"d3d12/DebugObjectD3D12.cpp",
"d3d12/DebugObjectD3D12.h",
"d3d12/DebugResourceAllocatorD3D12.cpp",
Expand Down Expand Up @@ -144,7 +145,6 @@ source_set("gpgmm_sources") {
"d3d12/UnknownD3D12.h",
"d3d12/UtilsD3D12.cpp",
"d3d12/UtilsD3D12.h",
"d3d12/d3d12_platform.h",
]
}

Expand Down
4 changes: 2 additions & 2 deletions src/gpgmm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ if (GPGMM_ENABLE_D3D12)
"d3d12/UnknownD3D12.h"
"d3d12/UtilsD3D12.cpp"
"d3d12/UtilsD3D12.h"
"d3d12/d3d12_platform.h"
"d3d12/D3D12Platform.h"
)
target_link_libraries(gpgmm PRIVATE dxguid.lib)
endif()
Expand All @@ -108,7 +108,7 @@ if (GPGMM_ENABLE_VK)
"vk/ResourceAllocatorVk.h"
"vk/FunctionsVk.cpp"
"vk/FunctionsVk.h"
"vk/vk_platform.h"
"vk/VKPlatform.h"
)

# Only link to Vulkan if static linking is used
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/BufferAllocatorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "gpgmm/common/MemoryAllocator.h"

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

namespace gpgmm::d3d12 {

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/CapsD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define GPGMM_D3D12_CAPSD3D12_H_

#include "gpgmm/common/GPUInfo.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/utils/Limits.h"

#include <cstdint>
Expand Down
0 src/gpgmm/d3d12/d3d12_platform.h → src/gpgmm/d3d12/D3D12Platform.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/DebugObjectD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "gpgmm/d3d12/UnknownD3D12.h"

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ErrorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define GPGMM_D3D12_ERRORD3D12_H_

#include "gpgmm/common/Error.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/utils/Compiler.h"
#include "gpgmm/utils/Log.h"

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/FenceD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef GPGMM_D3D12_FENCED3D12_H_
#define GPGMM_D3D12_FENCED3D12_H_

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/utils/NonCopyable.h"

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/JSONSerializerD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define GPGMM_D3D12_JSONSERIALIZERD3D12_H_

#include "gpgmm/common/JSONSerializer.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

#include <gpgmm_d3d12.h>

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResidencyListD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef GPGMM_D3D12_RESIDENCYLISTD3D12_H_
#define GPGMM_D3D12_RESIDENCYLISTD3D12_H_

#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/d3d12/UnknownD3D12.h"
#include "gpgmm/d3d12/d3d12_platform.h"

#include <gpgmm_d3d12.h>

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceHeapAllocatorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define GPGMM_D3D12_RESOURCEHEAPALLOCATORD3D12_H_

#include "gpgmm/common/MemoryAllocator.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

namespace gpgmm::d3d12 {

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceSizeD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define GPGMM_D3D12_RESOURCESIZE_H_

#include "gpgmm/common/SizeClass.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/utils/Utils.h"

namespace gpgmm::d3d12 {
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/UnknownD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef GPGMM_D3D12_UnknownD3D12_H_
#define GPGMM_D3D12_UnknownD3D12_H_

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"
#include "gpgmm/utils/NonCopyable.h"

#ifndef GPGMM_REFCOUNT_TYPE
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/UtilsD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef GPGMM_D3D12_UTILSD3D12_H_
#define GPGMM_D3D12_UTILSD3D12_H_

#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

#include "gpgmm/utils/Log.h"
#include "gpgmm/utils/WindowsUtils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/vk/CapsVk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef GPGMM_VK_CAPSVK_H_
#define GPGMM_VK_CAPSVK_H_

#include "gpgmm/vk/vk_platform.h"
#include "gpgmm/vk/VKPlatform.h"

#include <cstdint>

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/vk/DeviceMemoryVk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "gpgmm/common/Memory.h"

#include "gpgmm/vk/vk_platform.h"
#include "gpgmm/vk/VKPlatform.h"

namespace gpgmm::vk {

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/vk/ErrorVk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define GPGMM_VK_ERRORVK_H_

#include "gpgmm/common/Error.h"
#include "gpgmm/vk/vk_platform.h"
#include "gpgmm/vk/VKPlatform.h"

namespace gpgmm::vk {

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/vk/FunctionsVk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "gpgmm/vk/vk_platform.h"
#include "gpgmm/vk/VKPlatform.h"

namespace gpgmm::vk {

Expand Down
6 changes: 3 additions & 3 deletions src/gpgmm/vk/vk_platform.h → src/gpgmm/vk/VkPlatform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GPGMM_VK_VKPLATFORM_H_
#define GPGMM_VK_VKPLATFORM_H_
#ifndef GPGMM_VK_VKPlatform_H_
#define GPGMM_VK_VKPlatform_H_

#include <vulkan/vulkan.h>

#endif // GPGMM_VK_VKPLATFORM_H_
#endif // GPGMM_VK_VKPlatform_H_
2 changes: 1 addition & 1 deletion src/tests/D3D12Test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <vector>

#include <gpgmm_d3d12.h>
#include "gpgmm/d3d12/d3d12_platform.h"
#include "gpgmm/d3d12/D3D12Platform.h"

#define ASSERT_FAILED(expr) ASSERT_TRUE(FAILED(expr))
#define ASSERT_SUCCEEDED(expr) ASSERT_TRUE(SUCCEEDED(expr))
Expand Down
2 changes: 1 addition & 1 deletion src/tests/VKTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "tests/GPGMMTest.h"

#include "gpgmm/vk/vk_platform.h"
#include "gpgmm/vk/VKPlatform.h"

#define ASSERT_FAILED(expr) ASSERT_TRUE((expr) != VK_SUCCESS)
#define ASSERT_SUCCESS(expr) ASSERT_TRUE((expr) == VK_SUCCESS)
Expand Down