diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-01-20 16:59:42 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-04 17:58:09 -0700 |
| commit | 6dd064e0b67ea4073dcfa27f3879f3ec3ea538be (patch) | |
| tree | 6ed5ef53925fabb06b371abbce7d7323750a597d /include | |
| parent | e4207b405c795ffb94ae7043d93e9b3e55925d50 (diff) | |
| download | usermoji-6dd064e0b67ea4073dcfa27f3879f3ec3ea538be.tar.xz | |
memory alloc: Remove last heaps from memory alloc and requirements
Also reorder memory_alloc_info struct as memPriority added back in as last
member in struct.
Conflicts:
demos/cube.c
demos/tri.c
icd/intel/buf.c
icd/intel/event.c
icd/intel/img.c
icd/intel/mem.c
icd/intel/pipeline.c
icd/intel/query.c
include/xgl.h
tests/image_tests.cpp
tests/init.cpp
tests/render_tests.cpp
tests/xgltestbinding.cpp
tests/xgltestbinding.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xgl.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/xgl.h b/include/xgl.h index f8f6a7a2..a9aa3cbf 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -995,7 +995,6 @@ typedef enum _XGL_MEMORY_TYPE XGL_MEMORY_TYPE_OTHER = 0x00000000, // device memory that is not any of the others XGL_MEMORY_TYPE_BUFFER = 0x00000001, // memory for buffers and associated information XGL_MEMORY_TYPE_IMAGE = 0x00000002, // memory for images and associated information - XGL_MEMORY_TYPE_PIPELINE = 0x00000003, // memory for pipeline objects XGL_MAX_ENUM(_XGL_MEMORY_TYPE) } XGL_MEMORY_TYPE; @@ -1032,9 +1031,9 @@ typedef enum _XGL_BUFFER_VIEW_TYPE XGL_BUFFER_VIEW_TYPED = 0x00000001, // Typed buffer, format and channels are used (TBO, image buffer) XGL_BUFFER_VIEW_STRUCTURED = 0x00000002, // Structured buffer, stride is used (VBO, DX-style structured buffer) - XGL_BUFFER_VIEW_TYPE_BEGIN_RANGE = XGL_BUFFER_VIEW_RAW, - XGL_BUFFER_VIEW_TYPE_END_RANGE = XGL_BUFFER_VIEW_STRUCTURED, - XGL_NUM_BUFFER_VIEW_TYPE = (XGL_BUFFER_VIEW_TYPE_END_RANGE - XGL_BUFFER_VIEW_TYPE_BEGIN_RANGE + 1), + XGL_BUFFER_VIEW_TYPE_BEGIN_RANGE = XGL_BUFFER_VIEW_RAW, + XGL_BUFFER_VIEW_TYPE_END_RANGE = XGL_BUFFER_VIEW_STRUCTURED, + XGL_NUM_BUFFER_VIEW_TYPE = (XGL_BUFFER_VIEW_TYPE_END_RANGE - XGL_BUFFER_VIEW_TYPE_BEGIN_RANGE + 1), XGL_MAX_ENUM(_XGL_BUFFER_VIEW_TYPE) } XGL_BUFFER_VIEW_TYPE; @@ -1318,11 +1317,9 @@ typedef struct _XGL_MEMORY_ALLOC_INFO XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO XGL_VOID* pNext; // Pointer to next structure XGL_GPU_SIZE allocationSize; // Size of memory allocation - XGL_UINT heapCount; - const XGL_UINT* pHeaps; - XGL_MEMORY_PRIORITY memPriority; XGL_FLAGS memProps; // XGL_MEMORY_PROPERTY_FLAGS XGL_MEMORY_TYPE memType; + XGL_MEMORY_PRIORITY memPriority; } XGL_MEMORY_ALLOC_INFO; // This structure is included in the XGL_MEMORY_ALLOC_INFO chain @@ -1364,8 +1361,6 @@ typedef struct _XGL_MEMORY_REQUIREMENTS XGL_GPU_SIZE size; // Specified in bytes XGL_GPU_SIZE alignment; // Specified in bytes XGL_GPU_SIZE granularity; // Granularity on which xglBindObjectMemoryRange can bind sub-ranges of memory specified in bytes (usually the page size) - XGL_UINT heapCount; - XGL_UINT* pHeaps; XGL_FLAGS memProps; // XGL_MEMORY_PROPERTY_FLAGS XGL_MEMORY_TYPE memType; } XGL_MEMORY_REQUIREMENTS; |