diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-01-14 10:44:00 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-04 17:58:09 -0700 |
| commit | b759a2eeb57b70110b80533e211928b45f925b30 (patch) | |
| tree | c0bfa1fe33633a326f3a03a1fe0776e619c12d2b /include | |
| parent | 30893a633f3ed6457ada5fd520182727113981f7 (diff) | |
| download | usermoji-b759a2eeb57b70110b80533e211928b45f925b30.tar.xz | |
memory alloc: Remove xglGetMemoryHeapXXX from driver,loader, glave, layers
Diffstat (limited to 'include')
| -rw-r--r-- | include/xgl.h | 47 | ||||
| -rw-r--r-- | include/xglLayer.h | 2 |
2 files changed, 0 insertions, 49 deletions
diff --git a/include/xgl.h b/include/xgl.h index 03a09132..c243b68a 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -668,19 +668,6 @@ typedef enum _XGL_SYSTEM_ALLOC_TYPE XGL_MAX_ENUM(_XGL_SYSTEM_ALLOC_TYPE) } XGL_SYSTEM_ALLOC_TYPE; -typedef enum _XGL_HEAP_MEMORY_TYPE -{ - XGL_HEAP_MEMORY_OTHER = 0x00000000, - XGL_HEAP_MEMORY_LOCAL = 0x00000001, - XGL_HEAP_MEMORY_REMOTE = 0x00000002, - XGL_HEAP_MEMORY_EMBEDDED = 0x00000003, - - XGL_HEAP_MEMORY_BEGIN_RANGE = XGL_HEAP_MEMORY_OTHER, - XGL_HEAP_MEMORY_END_RANGE = XGL_HEAP_MEMORY_EMBEDDED, - XGL_NUM_HEAP_MEMORY_TYPE = (XGL_HEAP_MEMORY_END_RANGE - XGL_HEAP_MEMORY_BEGIN_RANGE + 1), - XGL_MAX_ENUM(_XGL_HEAP_MEMORY_TYPE) -} XGL_HEAP_MEMORY_TYPE; - typedef enum _XGL_PHYSICAL_GPU_TYPE { XGL_GPU_TYPE_OTHER = 0x00000000, @@ -705,14 +692,6 @@ typedef enum _XGL_PHYSICAL_GPU_INFO_TYPE XGL_MAX_ENUM(_XGL_PHYSICAL_GPU_INFO_TYPE) } XGL_PHYSICAL_GPU_INFO_TYPE; -typedef enum _XGL_MEMORY_HEAP_INFO_TYPE -{ - // Info type for xglGetMemoryHeapInfo() - XGL_INFO_TYPE_MEMORY_HEAP_PROPERTIES = 0x00000000, - - XGL_MAX_ENUM(_XGL_MEMORY_HEAP_INFO_TYPE) -} XGL_MEMORY_HEAP_INFO_TYPE; - typedef enum _XGL_FORMAT_INFO_TYPE { // Info type for xlgGetFormatInfo() @@ -1286,19 +1265,6 @@ typedef struct _XGL_PHYSICAL_GPU_MEMORY_PROPERTIES XGL_BOOL supportsPinning; } XGL_PHYSICAL_GPU_MEMORY_PROPERTIES; -typedef struct _XGL_MEMORY_HEAP_PROPERTIES -{ - XGL_SIZE structSize; // Size of structure in bytes - XGL_HEAP_MEMORY_TYPE heapMemoryType; // XGL_HEAP_MEMORY_TYPE - XGL_GPU_SIZE heapSize; // Specified in bytes - XGL_GPU_SIZE pageSize; // Specified in bytes - XGL_FLAGS flags; // XGL_MEMORY_HEAP_FLAGS - XGL_FLOAT gpuReadPerfRating; - XGL_FLOAT gpuWritePerfRating; - XGL_FLOAT cpuReadPerfRating; - XGL_FLOAT cpuWritePerfRating; -} XGL_MEMORY_HEAP_PROPERTIES; - typedef struct _XGL_MEMORY_ALLOC_INFO { XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO @@ -2066,8 +2032,6 @@ typedef XGL_RESULT (XGLAPI *xglQueueSubmitType)(XGL_QUEUE queue, XGL_UINT cmdBuf typedef XGL_RESULT (XGLAPI *xglQueueSetGlobalMemReferencesType)(XGL_QUEUE queue, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs); typedef XGL_RESULT (XGLAPI *xglQueueWaitIdleType)(XGL_QUEUE queue); typedef XGL_RESULT (XGLAPI *xglDeviceWaitIdleType)(XGL_DEVICE device); -typedef XGL_RESULT (XGLAPI *xglGetMemoryHeapCountType)(XGL_DEVICE device, XGL_UINT* pCount); -typedef XGL_RESULT (XGLAPI *xglGetMemoryHeapInfoType)(XGL_DEVICE device, XGL_UINT heapId, XGL_MEMORY_HEAP_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData); typedef XGL_RESULT (XGLAPI *xglAllocMemoryType)(XGL_DEVICE device, const XGL_MEMORY_ALLOC_INFO* pAllocInfo, XGL_GPU_MEMORY* pMem); typedef XGL_RESULT (XGLAPI *xglFreeMemoryType)(XGL_GPU_MEMORY mem); typedef XGL_RESULT (XGLAPI *xglSetMemoryPriorityType)(XGL_GPU_MEMORY mem, XGL_MEMORY_PRIORITY priority); @@ -2240,17 +2204,6 @@ XGL_RESULT XGLAPI xglDeviceWaitIdle( // Memory functions -XGL_RESULT XGLAPI xglGetMemoryHeapCount( - XGL_DEVICE device, - XGL_UINT* pCount); - -XGL_RESULT XGLAPI xglGetMemoryHeapInfo( - XGL_DEVICE device, - XGL_UINT heapId, - XGL_MEMORY_HEAP_INFO_TYPE infoType, - XGL_SIZE* pDataSize, - XGL_VOID* pData); - XGL_RESULT XGLAPI xglAllocMemory( XGL_DEVICE device, const XGL_MEMORY_ALLOC_INFO* pAllocInfo, diff --git a/include/xglLayer.h b/include/xglLayer.h index 09537dc1..756b954f 100644 --- a/include/xglLayer.h +++ b/include/xglLayer.h @@ -37,8 +37,6 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE xglQueueSetGlobalMemReferencesType QueueSetGlobalMemReferences; xglQueueWaitIdleType QueueWaitIdle; xglDeviceWaitIdleType DeviceWaitIdle; - xglGetMemoryHeapCountType GetMemoryHeapCount; - xglGetMemoryHeapInfoType GetMemoryHeapInfo; xglAllocMemoryType AllocMemory; xglFreeMemoryType FreeMemory; xglSetMemoryPriorityType SetMemoryPriority; |