Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/gpgmm/common/MemoryAllocation.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "gpgmm/utils/Limits.h"
#include "include/gpgmm.h"
#include "include/gpgmm_export.h"

namespace gpgmm {

Expand Down Expand Up @@ -46,7 +45,7 @@ namespace gpgmm {
It can represent a location in memory by one of two ways: 1) a range within a memory block or 2)
a memory block of the entire memory range.
*/
class GPGMM_EXPORT MemoryAllocation {
class MemoryAllocation {
public:
/** \brief Contructs an invalid memory allocation.
*/
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/d3d12/DebugObjectD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
#include "gpgmm/d3d12/IUnknownImplD3D12.h"

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

#include <string>

namespace gpgmm::d3d12 {
class GPGMM_EXPORT DebugObject : public IUnknownImpl {
class DebugObject : public IUnknownImpl {
public:
virtual ~DebugObject() override = default;

Expand Down
6 changes: 1 addition & 5 deletions src/gpgmm/d3d12/HeapD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "gpgmm/utils/Limits.h"
#include "gpgmm/utils/LinkedList.h"
#include "include/gpgmm_d3d12.h"
#include "include/gpgmm_export.h"

#include <functional> // for std::function
#include <memory>
Expand All @@ -31,10 +30,7 @@ namespace gpgmm::d3d12 {

class ResidencyManager;

class GPGMM_EXPORT Heap final : public MemoryBase,
public DebugObject,
public LinkNode<Heap>,
public IHeap {
class Heap final : public MemoryBase, public DebugObject, public LinkNode<Heap>, public IHeap {
public:
static HRESULT CreateHeap(const HEAP_DESC& descriptor,
IResidencyManager* const pResidencyManager,
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/d3d12/IUnknownImplD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

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

#ifndef GPGMM_REFCOUNT_TYPE
# include "gpgmm/utils/RefCount.h"
Expand All @@ -32,7 +31,7 @@ namespace gpgmm::d3d12 {

The custom COM based object must override DeleteThis() if they require a custom-deleter.
*/
class GPGMM_EXPORT IUnknownImpl : public IUnknown, public NonCopyable {
class IUnknownImpl : public IUnknown, public NonCopyable {
public:
IUnknownImpl();
virtual ~IUnknownImpl() = default;
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/d3d12/ResidencyListD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "gpgmm/d3d12/IUnknownImplD3D12.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "include/gpgmm_d3d12.h"
#include "include/gpgmm_export.h"

#include <vector>

Expand All @@ -28,7 +27,7 @@ namespace gpgmm::d3d12 {
class JSONSerializer;
class ResidencyManager;

class GPGMM_EXPORT ResidencyList final : public IResidencyList, public IUnknownImpl {
class ResidencyList final : public IResidencyList, public IUnknownImpl {
public:
ResidencyList();
~ResidencyList() override;
Expand Down
3 changes: 1 addition & 2 deletions src/gpgmm/d3d12/ResidencyManagerD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "gpgmm/utils/EnumFlags.h"
#include "gpgmm/utils/LinkedList.h"
#include "include/gpgmm_d3d12.h"
#include "include/gpgmm_export.h"

#include <memory>
#include <mutex>
Expand All @@ -38,7 +37,7 @@ namespace gpgmm::d3d12 {
class ResourceAllocator;
class ResourceHeapAllocator;

class GPGMM_EXPORT ResidencyManager final : public IUnknownImpl, public IResidencyManager {
class ResidencyManager final : public IUnknownImpl, public IResidencyManager {
public:
static HRESULT CreateResidencyManager(const RESIDENCY_DESC& descriptor,
IResidencyManager** ppResidencyManagerOut);
Expand Down
7 changes: 3 additions & 4 deletions src/gpgmm/d3d12/ResourceAllocationD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@
#include "gpgmm/d3d12/IUnknownImplD3D12.h"
#include "gpgmm/d3d12/d3d12_platform.h"
#include "include/gpgmm_d3d12.h"
#include "include/gpgmm_export.h"

namespace gpgmm::d3d12 {

class DebugResourceAllocator;
class ResidencyManager;
class ResourceAllocator;

class GPGMM_EXPORT ResourceAllocation final : public MemoryAllocation,
public DebugObject,
public IResourceAllocation {
class ResourceAllocation final : public MemoryAllocation,
public DebugObject,
public IResourceAllocation {
public:
~ResourceAllocation() override;

Expand Down
7 changes: 3 additions & 4 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "gpgmm/d3d12/IUnknownImplD3D12.h"
#include "gpgmm/utils/EnumFlags.h"
#include "include/gpgmm_d3d12.h"
#include "include/gpgmm_export.h"

#include <array>
#include <memory>
Expand All @@ -35,9 +34,9 @@ namespace gpgmm::d3d12 {
class ResidencyManager;
class ResourceAllocation;

class GPGMM_EXPORT ResourceAllocator final : public IUnknownImpl,
public IResourceAllocator,
public MemoryAllocator {
class ResourceAllocator final : public IUnknownImpl,
public IResourceAllocator,
public MemoryAllocator {
public:
static HRESULT CreateResourceAllocator(const ALLOCATOR_DESC& allocatorDescriptor,
IResourceAllocator** ppResourceAllocatorOut,
Expand Down
1 change: 0 additions & 1 deletion src/gpgmm/vk/ResourceAllocatorVk.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "gpgmm/common/MemoryAllocator.h"
#include "gpgmm/vk/FunctionsVk.h"
#include "include/gpgmm_export.h"
#include "include/gpgmm_vk.h"

#include <vector>
Expand Down
1 change: 1 addition & 0 deletions src/include/gpgmm_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#endif

#include "gpgmm.h"
#include "gpgmm_export.h"

namespace gpgmm::vk {

Expand Down