From 21f75edb0324521ee35e7a46c6cbe64fffe664ee Mon Sep 17 00:00:00 2001
From: "Bernhart, Bryan" <bryan.bernhart@intel.com>
Date: Tue, 4 Apr 2023 13:25:10 -0700
Subject: [PATCH] Depreciate gpgmm header.

---
 include/gpgmm.h                     | 29 -----------------------------
 include/gpgmm_d3d12.h               |  4 +++-
 include/gpgmm_vk.h                  |  2 +-
 src/gpgmm/common/MemoryAllocation.h |  2 --
 src/gpgmm/common/MemoryAllocator.h  |  2 --
 src/mvi/gpgmm.h                     |  3 +--
 6 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 include/gpgmm.h

diff --git a/include/gpgmm.h b/include/gpgmm.h
deleted file mode 100644
index ac73df3c6..000000000
--- a/include/gpgmm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The GPGMM Authors
-//
-// 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.
-
-#ifndef INCLUDE_GPGMM_H_
-#define INCLUDE_GPGMM_H_
-
-// gpgmm.h is the GMM interface implemented by GPGMM.
-// This file should not be modified by downstream GMM clients or forks of GPGMM.
-// Please consider submitting a pull-request to https://github.com/intel/gpgmm.
-#include "gpgmm_export.h"
-
-#include <cstdint>
-
-namespace gpgmm {
-
-}  // namespace gpgmm
-
-#endif  // INCLUDE_GPGMM_H_
diff --git a/include/gpgmm_d3d12.h b/include/gpgmm_d3d12.h
index e64981741..2fbe51b83 100644
--- a/include/gpgmm_d3d12.h
+++ b/include/gpgmm_d3d12.h
@@ -18,7 +18,9 @@
 // gpgmm_d3d12.h is the GMM interface implemented by GPGMM for D3D12.
 // This file should not be modified by downstream GMM clients or forks of GPGMM.
 // Please consider submitting a pull-request to https://github.com/intel/gpgmm.
-#include "gpgmm.h"
+#include "gpgmm_export.h"
+
+#include <cstdint>
 
 // User should decide to define the following macros:
 // - GPGMM_D3D12_HEADERS_ALREADY_INCLUDED: D3D12 platform headers will be already included before
diff --git a/include/gpgmm_vk.h b/include/gpgmm_vk.h
index f668607b9..63cc9fcf7 100644
--- a/include/gpgmm_vk.h
+++ b/include/gpgmm_vk.h
@@ -18,7 +18,7 @@
 // gpgmm_vk.h is the GMM interface implemented by GPGMM for Vulkan.
 // This file should not be modified by downstream GMM clients or forks of GPGMM.
 // Please consider submitting a pull-request to https://github.com/intel/gpgmm.
-#include "gpgmm.h"
+#include "gpgmm_export.h"
 
 #ifndef GPGMM_VK_HEADERS_ALREADY_INCLUDED
 #    include <vulkan/vulkan.h>
diff --git a/src/gpgmm/common/MemoryAllocation.h b/src/gpgmm/common/MemoryAllocation.h
index 0ca0cf77f..b6b99d937 100644
--- a/src/gpgmm/common/MemoryAllocation.h
+++ b/src/gpgmm/common/MemoryAllocation.h
@@ -19,8 +19,6 @@
 #include "gpgmm/common/Object.h"
 #include "gpgmm/utils/Limits.h"
 
-#include <gpgmm.h>
-
 namespace gpgmm {
 
     /** \enum AllocationMethod
diff --git a/src/gpgmm/common/MemoryAllocator.h b/src/gpgmm/common/MemoryAllocator.h
index d47fb9028..85d6b37c7 100644
--- a/src/gpgmm/common/MemoryAllocator.h
+++ b/src/gpgmm/common/MemoryAllocator.h
@@ -26,8 +26,6 @@
 #include "gpgmm/utils/LinkedList.h"
 #include "gpgmm/utils/Log.h"
 
-#include <gpgmm.h>
-
 #include <memory>
 #include <mutex>
 
diff --git a/src/mvi/gpgmm.h b/src/mvi/gpgmm.h
index 3509517ab..9325fadc1 100644
--- a/src/mvi/gpgmm.h
+++ b/src/mvi/gpgmm.h
@@ -15,8 +15,7 @@
 #ifndef MVI_GPGMM_H_
 #define MVI_GPGMM_H_
 
-#include <gpgmm.h>
-
+#include <cstdint>
 #include <memory>
 
 namespace gpgmm {