intel · bbernhar · Oct 1, 2022 · Oct 1, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 
 # Only <PROJECT-NAME>_SOURCE_DIR is created by the project() command above.
 set(GPGMM_ROOT_DIR "${GPGMM_SOURCE_DIR}")
-set(GPGMM_INCLUDE_DIR "${GPGMM_ROOT_DIR}/src/include")
+set(GPGMM_INCLUDE_DIR "${GPGMM_ROOT_DIR}/include")
 
 # ###############################################################################
 # Configuration options

diff --git a/Doxyfile b/Doxyfile
@@ -864,7 +864,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src
+INPUT                  = include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/README.md b/README.md
@@ -206,7 +206,7 @@ cmake --build . --config Debug
 
 1. Copy the DLL into the `$(OutputPath)` folder and configure the VS build:
 2. Highlight project in the **Solution Explorer**, and then select **Project > Properties**.
-3. Under **Configuration Properties > C/C++ > General**, add `gpgmm\src\include` to **Additional Include Directories**.
+3. Under **Configuration Properties > C/C++ > General**, add `gpgmm\include` to **Additional Include Directories**.
 4. Under **Configuration Properties > Linker > Input**, add ``gpgmm.dll.lib`` to **Additional Dependencies**.
 5. Under **Configuration Properties > Linker > General**, add the folder path to `out\Release` to **Additional Library Directories**.
 

diff --git a/docs/DESIGN.md b/docs/DESIGN.md
@@ -195,7 +195,7 @@ TBD
 
 ## API Endpoints
 
-Public (exported) functions and symbols are in `src\include` directory, where `#include <gpgmm_*.h>` defines the GPGMM API for the particular backend API (ex. `gpgmm_d3d12.h`).
+Public (exported) functions and symbols are in `gpgmm/include` directory, where `#include <gpgmm_*.h>` defines the GPGMM API for the particular backend API (ex. `gpgmm_d3d12.h`).
 
 Auto-generated API documentation:
 https://intel.github.io/GPGMM/

diff --git a/src/include/gpgmm.h → include/gpgmm.h b/src/include/gpgmm.h → include/gpgmm.h
diff --git a/src/include/gpgmm_d3d12.h → include/gpgmm_d3d12.h b/src/include/gpgmm_d3d12.h → include/gpgmm_d3d12.h
diff --git a/src/include/gpgmm_export.h → include/gpgmm_export.h b/src/include/gpgmm_export.h → include/gpgmm_export.h
diff --git a/src/include/gpgmm_vk.h → include/gpgmm_vk.h b/src/include/gpgmm_vk.h → include/gpgmm_vk.h
diff --git a/src/gpgmm/BUILD.gn b/src/gpgmm/BUILD.gn
@@ -67,7 +67,7 @@ source_set("gpgmm_headers") {
   # public_deps = [ "${gpgmm_root_dir}/src/gpgmm:gpgmmcpp_headers" ]
   all_dependent_configs =
       [ "${gpgmm_root_dir}/src/gpgmm/common:gpgmm_public_config" ]
-  sources = [ "${gpgmm_root_dir}/src/include/gpgmm_export.h" ]
+  sources = [ "${gpgmm_root_dir}/include/gpgmm_export.h" ]
 }
 
 # The meat of the compilation for gpgmm so that we can cheaply have

diff --git a/src/gpgmm/common/BUILD.gn b/src/gpgmm/common/BUILD.gn
@@ -34,7 +34,7 @@ if (build_with_chromium) {
 ###############################################################################
 
 config("gpgmm_public_config") {
-  include_dirs = [ "${gpgmm_root_dir}/src/include" ]
+  include_dirs = [ "${gpgmm_root_dir}/include" ]
 }
 
 config("gpgmm_common_config") {

diff --git a/src/gpgmm/common/Memory.h b/src/gpgmm/common/Memory.h
@@ -17,7 +17,8 @@
 
 #include "gpgmm/common/Object.h"
 #include "gpgmm/utils/RefCount.h"
-#include "include/gpgmm.h"
+
+#include <gpgmm.h>
 
 namespace gpgmm {
 

diff --git a/src/gpgmm/common/MemoryAllocation.h b/src/gpgmm/common/MemoryAllocation.h
@@ -17,7 +17,8 @@
 #define GPGMM_COMMON_MEMORYALLOCATION_H_
 
 #include "gpgmm/utils/Limits.h"
-#include "include/gpgmm.h"
+
+#include <gpgmm.h>
 
 namespace gpgmm {
 

diff --git a/src/gpgmm/common/MemoryAllocator.h b/src/gpgmm/common/MemoryAllocator.h
@@ -25,7 +25,8 @@
 #include "gpgmm/utils/Limits.h"
 #include "gpgmm/utils/LinkedList.h"
 #include "gpgmm/utils/Log.h"
-#include "include/gpgmm.h"
+
+#include <gpgmm.h>
 
 #include <memory>
 #include <mutex>

diff --git a/src/gpgmm/common/MemoryPool.h b/src/gpgmm/common/MemoryPool.h
@@ -17,7 +17,8 @@
 
 #include "gpgmm/common/MemoryAllocation.h"
 #include "gpgmm/utils/Limits.h"
-#include "include/gpgmm.h"
+
+#include <gpgmm.h>
 
 #include <memory>
 

diff --git a/src/gpgmm/d3d12/HeapD3D12.h b/src/gpgmm/d3d12/HeapD3D12.h
@@ -21,10 +21,8 @@
 #include "gpgmm/d3d12/IUnknownImplD3D12.h"
 #include "gpgmm/utils/Limits.h"
 #include "gpgmm/utils/LinkedList.h"
-#include "include/gpgmm_d3d12.h"
 
-#include <functional>  // for std::function
-#include <memory>
+#include <gpgmm_d3d12.h>
 
 namespace gpgmm::d3d12 {
 

diff --git a/src/gpgmm/d3d12/JSONSerializerD3D12.h b/src/gpgmm/d3d12/JSONSerializerD3D12.h
@@ -17,7 +17,8 @@
 
 #include "gpgmm/common/JSONSerializer.h"
 #include "gpgmm/d3d12/d3d12_platform.h"
-#include "include/gpgmm_d3d12.h"
+
+#include <gpgmm_d3d12.h>
 
 namespace gpgmm::d3d12 {
 

diff --git a/src/gpgmm/d3d12/ResidencyListD3D12.h b/src/gpgmm/d3d12/ResidencyListD3D12.h
@@ -17,7 +17,8 @@
 
 #include "gpgmm/d3d12/IUnknownImplD3D12.h"
 #include "gpgmm/d3d12/d3d12_platform.h"
-#include "include/gpgmm_d3d12.h"
+
+#include <gpgmm_d3d12.h>
 
 #include <vector>
 

diff --git a/src/gpgmm/d3d12/ResidencyManagerD3D12.h b/src/gpgmm/d3d12/ResidencyManagerD3D12.h
@@ -19,7 +19,8 @@
 #include "gpgmm/d3d12/IUnknownImplD3D12.h"
 #include "gpgmm/utils/EnumFlags.h"
 #include "gpgmm/utils/LinkedList.h"
-#include "include/gpgmm_d3d12.h"
+
+#include <gpgmm_d3d12.h>
 
 #include <memory>
 #include <mutex>

diff --git a/src/gpgmm/d3d12/ResourceAllocationD3D12.h b/src/gpgmm/d3d12/ResourceAllocationD3D12.h
@@ -20,7 +20,8 @@
 #include "gpgmm/d3d12/DebugObjectD3D12.h"
 #include "gpgmm/d3d12/IUnknownImplD3D12.h"
 #include "gpgmm/d3d12/d3d12_platform.h"
-#include "include/gpgmm_d3d12.h"
+
+#include <gpgmm_d3d12.h>
 
 namespace gpgmm::d3d12 {
 

diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.h b/src/gpgmm/d3d12/ResourceAllocatorD3D12.h
@@ -19,7 +19,8 @@
 #include "gpgmm/common/MemoryAllocator.h"
 #include "gpgmm/d3d12/IUnknownImplD3D12.h"
 #include "gpgmm/utils/EnumFlags.h"
-#include "include/gpgmm_d3d12.h"
+
+#include <gpgmm_d3d12.h>
 
 #include <array>
 #include <memory>

diff --git a/src/gpgmm/vk/ResourceAllocatorVk.h b/src/gpgmm/vk/ResourceAllocatorVk.h
@@ -17,7 +17,8 @@
 
 #include "gpgmm/common/MemoryAllocator.h"
 #include "gpgmm/vk/FunctionsVk.h"
-#include "include/gpgmm_vk.h"
+
+#include <gpgmm_vk.h>
 
 #include <vector>
 

diff --git a/src/samples/BUILD.gn b/src/samples/BUILD.gn
@@ -42,14 +42,14 @@ source_set("gpgmm_mvi") {
     "${gpgmm_root_dir}/src/mvi/gpgmm_mvi.cpp",
     "${gpgmm_root_dir}/src/mvi/gpgmm_mvi.h",
   ]
-  include_dirs = [ "${gpgmm_root_dir}/src/include" ]
+  include_dirs = [ "${gpgmm_root_dir}/include" ]
 }
 
 executable("D3D12SampleMVI") {
   deps = [ ":gpgmm_mvi" ]
   defines = [ "GPGMM_D3D12_HEADERS_ALREADY_INCLUDED" ]
   sources = [ "D3D12Sample.cpp" ]
-  include_dirs = [ "${gpgmm_root_dir}/src/include" ]
+  include_dirs = [ "${gpgmm_root_dir}/include" ]
   libs = [
     "d3d12.lib",
     "dxgi.lib",

diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
@@ -27,7 +27,7 @@ if (GPGMM_ENABLE_D3D12)
 
 	# Target explaination:
   # gpgmm_common_config target fixes duplicate min/max symbol error (on Windows).
-	# gpgmm_public_config target adds include paths to src/ and src/include.
+	# gpgmm_public_config target adds include paths.
   # gpgmm is the main library target.
 	target_link_libraries(D3D12Sample PRIVATE
     gpgmm_common_config