diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-03-26 15:04:41 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:33:27 +0800 |
| commit | a2aa86389a06b8d092d16b757cbb6b9bf83f539d (patch) | |
| tree | 8a4f5ac9e6969231e8ae24c648b65f4c434f3aeb /include | |
| parent | 63ea926a2159f191a55d8540376277d177253272 (diff) | |
| download | usermoji-a2aa86389a06b8d092d16b757cbb6b9bf83f539d.tar.xz | |
binding: update XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO
XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO now has an array of bindings. Rename
intel_desc_layout_range to intel_desc_layout_binding.
Diffstat (limited to 'include')
| -rw-r--r-- | include/xgl.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/xgl.h b/include/xgl.h index a9314ec4..5d80dfa4 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -1815,14 +1815,20 @@ typedef struct _XGL_SHADER_CREATE_INFO XGL_FLAGS flags; // Reserved } XGL_SHADER_CREATE_INFO; -typedef struct _XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO +typedef struct _XGL_DESCRIPTOR_SET_LAYOUT_BINDING { - XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO - const void* pNext; // Pointer to next structure XGL_DESCRIPTOR_TYPE descriptorType; uint32_t count; XGL_FLAGS stageFlags; // XGL_SHADER_STAGE_FLAGS XGL_SAMPLER immutableSampler; +} XGL_DESCRIPTOR_SET_LAYOUT_BINDING; + +typedef struct _XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO +{ + XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO + const void* pNext; // Pointer to next structure + uint32_t count; // Number of bindings in the descriptor set layout + const XGL_DESCRIPTOR_SET_LAYOUT_BINDING* pBinding; // Array of descriptor set layout bindings } XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; typedef struct _XGL_DESCRIPTOR_TYPE_COUNT @@ -2302,7 +2308,7 @@ typedef XGL_RESULT (XGLAPI *xglStorePipelineType)(XGL_PIPELINE pipeline, size_t* typedef XGL_RESULT (XGLAPI *xglLoadPipelineType)(XGL_DEVICE device, size_t dataSize, const void* pData, XGL_PIPELINE* pPipeline); typedef XGL_RESULT (XGLAPI *xglLoadPipelineDerivativeType)(XGL_DEVICE device, size_t dataSize, const void* pData, XGL_PIPELINE basePipeline, XGL_PIPELINE* pPipeline); typedef XGL_RESULT (XGLAPI *xglCreateSamplerType)(XGL_DEVICE device, const XGL_SAMPLER_CREATE_INFO* pCreateInfo, XGL_SAMPLER* pSampler); -typedef XGL_RESULT (XGLAPI *xglCreateDescriptorSetLayoutType)(XGL_DEVICE device, XGL_FLAGS stageFlags, const uint32_t* pSetBindPoints, XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout, const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout); +typedef XGL_RESULT (XGLAPI *xglCreateDescriptorSetLayoutType)(XGL_DEVICE device, XGL_FLAGS stageFlags, const uint32_t* pSetBindPoints, XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout, const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout); typedef XGL_RESULT (XGLAPI *xglBeginDescriptorPoolUpdateType)(XGL_DEVICE device, XGL_DESCRIPTOR_UPDATE_MODE updateMode); typedef XGL_RESULT (XGLAPI *xglEndDescriptorPoolUpdateType)(XGL_DEVICE device, XGL_CMD_BUFFER cmd); typedef XGL_RESULT (XGLAPI *xglCreateDescriptorPoolType)(XGL_DEVICE device, XGL_DESCRIPTOR_POOL_USAGE poolUsage, uint32_t maxSets, const XGL_DESCRIPTOR_POOL_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_POOL* pDescriptorPool); @@ -2698,7 +2704,7 @@ XGL_RESULT XGLAPI xglCreateDescriptorSetLayout( XGL_FLAGS stageFlags, // XGL_SHADER_STAGE_FLAGS const uint32_t* pSetBindPoints, XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout, - const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList, + const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout); XGL_RESULT XGLAPI xglBeginDescriptorPoolUpdate( |