binding: rename descriptor region to descriptor pool

This should be trivial, except that the intel driver has intel_desc_pool
internally.  Exchange the names of intel_desc_pool and intel_desc_region.

3 files changed, 35 insertions, 35 deletions

diff --git a/include/xgl.h b/include/xgl.h
index c9c27917..a9314ec4 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -72,7 +72,7 @@ XGL_DEFINE_SUBCLASS_HANDLE(XGL_PIPELINE, XGL_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_SAMPLER, XGL_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_DESCRIPTOR_SET, XGL_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_DESCRIPTOR_SET_LAYOUT, XGL_OBJECT)
-XGL_DEFINE_SUBCLASS_HANDLE(XGL_DESCRIPTOR_REGION, XGL_OBJECT)
+XGL_DEFINE_SUBCLASS_HANDLE(XGL_DESCRIPTOR_POOL, XGL_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_DYNAMIC_STATE_OBJECT, XGL_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_DYNAMIC_VP_STATE_OBJECT, XGL_DYNAMIC_STATE_OBJECT)
 XGL_DEFINE_SUBCLASS_HANDLE(XGL_DYNAMIC_RS_STATE_OBJECT, XGL_DYNAMIC_STATE_OBJECT)
@@ -299,16 +299,16 @@ typedef enum _XGL_DESCRIPTOR_TYPE
     XGL_MAX_ENUM(_XGL_DESCRIPTOR_TYPE)
 } XGL_DESCRIPTOR_TYPE;
 
-typedef enum _XGL_DESCRIPTOR_REGION_USAGE
+typedef enum _XGL_DESCRIPTOR_POOL_USAGE
 {
-    XGL_DESCRIPTOR_REGION_USAGE_ONE_SHOT                    = 0x00000000,
-    XGL_DESCRIPTOR_REGION_USAGE_DYNAMIC                     = 0x00000001,
+    XGL_DESCRIPTOR_POOL_USAGE_ONE_SHOT                      = 0x00000000,
+    XGL_DESCRIPTOR_POOL_USAGE_DYNAMIC                       = 0x00000001,
 
-    XGL_DESCRIPTOR_REGION_USAGE_BEGIN_RANGE                 = XGL_DESCRIPTOR_REGION_USAGE_ONE_SHOT,
-    XGL_DESCRIPTOR_REGION_USAGE_END_RANGE                   = XGL_DESCRIPTOR_REGION_USAGE_DYNAMIC,
-    XGL_NUM_DESCRIPTOR_REGION_USAGE                         = (XGL_DESCRIPTOR_REGION_USAGE_END_RANGE - XGL_DESCRIPTOR_REGION_USAGE_BEGIN_RANGE + 1),
-    XGL_MAX_ENUM(_XGL_DESCRIPTOR_REGION_USAGE)
-} XGL_DESCRIPTOR_REGION_USAGE;
+    XGL_DESCRIPTOR_POOL_USAGE_BEGIN_RANGE                   = XGL_DESCRIPTOR_POOL_USAGE_ONE_SHOT,
+    XGL_DESCRIPTOR_POOL_USAGE_END_RANGE                     = XGL_DESCRIPTOR_POOL_USAGE_DYNAMIC,
+    XGL_NUM_DESCRIPTOR_POOL_USAGE                           = (XGL_DESCRIPTOR_POOL_USAGE_END_RANGE - XGL_DESCRIPTOR_POOL_USAGE_BEGIN_RANGE + 1),
+    XGL_MAX_ENUM(_XGL_DESCRIPTOR_POOL_USAGE)
+} XGL_DESCRIPTOR_POOL_USAGE;
 
 typedef enum _XGL_DESCRIPTOR_UPDATE_MODE
 {
@@ -1049,7 +1049,7 @@ typedef enum _XGL_STRUCTURE_TYPE
     XGL_STRUCTURE_TYPE_MEMORY_BARRIER                       = 45,
     XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                = 46,
     XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                 = 47,
-    XGL_STRUCTURE_TYPE_DESCRIPTOR_REGION_CREATE_INFO        = 48,
+    XGL_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO          = 48,
     XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS                      = 49,
     XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES              = 50,
     XGL_STRUCTURE_TYPE_UPDATE_IMAGES                        = 51,
@@ -1831,13 +1831,13 @@ typedef struct _XGL_DESCRIPTOR_TYPE_COUNT
     uint32_t                                count;
 } XGL_DESCRIPTOR_TYPE_COUNT;
 
-typedef struct _XGL_DESCRIPTOR_REGION_CREATE_INFO
+typedef struct _XGL_DESCRIPTOR_POOL_CREATE_INFO
 {
-    XGL_STRUCTURE_TYPE                      sType;              // Must be XGL_STRUCTURE_TYPE_DESCRIPTOR_REGION_CREATE_INFO
+    XGL_STRUCTURE_TYPE                      sType;              // Must be XGL_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO
     const void*                             pNext;              // Pointer to next structure
     uint32_t                                count;
     const XGL_DESCRIPTOR_TYPE_COUNT*        pTypeCount;
-} XGL_DESCRIPTOR_REGION_CREATE_INFO;
+} XGL_DESCRIPTOR_POOL_CREATE_INFO;
 
 typedef struct _XGL_LINK_CONST_BUFFER
 {
@@ -2303,12 +2303,12 @@ typedef XGL_RESULT (XGLAPI *xglLoadPipelineType)(XGL_DEVICE device, size_t dataS
 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 *xglBeginDescriptorRegionUpdateType)(XGL_DEVICE device, XGL_DESCRIPTOR_UPDATE_MODE updateMode);
-typedef XGL_RESULT (XGLAPI *xglEndDescriptorRegionUpdateType)(XGL_DEVICE device, XGL_CMD_BUFFER cmd);
-typedef XGL_RESULT (XGLAPI *xglCreateDescriptorRegionType)(XGL_DEVICE device, XGL_DESCRIPTOR_REGION_USAGE regionUsage, uint32_t maxSets, const XGL_DESCRIPTOR_REGION_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_REGION* pDescriptorRegion);
-typedef XGL_RESULT (XGLAPI *xglClearDescriptorRegionType)(XGL_DESCRIPTOR_REGION descriptorRegion);
-typedef XGL_RESULT (XGLAPI *xglAllocDescriptorSetsType)(XGL_DESCRIPTOR_REGION descriptorRegion, XGL_DESCRIPTOR_SET_USAGE setUsage, uint32_t count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, uint32_t* pCount);
-typedef void       (XGLAPI *xglClearDescriptorSetsType)(XGL_DESCRIPTOR_REGION descriptorRegion, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets);
+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);
+typedef XGL_RESULT (XGLAPI *xglClearDescriptorPoolType)(XGL_DESCRIPTOR_POOL descriptorPool);
+typedef XGL_RESULT (XGLAPI *xglAllocDescriptorSetsType)(XGL_DESCRIPTOR_POOL descriptorPool, XGL_DESCRIPTOR_SET_USAGE setUsage, uint32_t count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, uint32_t* pCount);
+typedef void       (XGLAPI *xglClearDescriptorSetsType)(XGL_DESCRIPTOR_POOL descriptorPool, uint32_t count, const XGL_DESCRIPTOR_SET* pDescriptorSets);
 typedef void       (XGLAPI *xglUpdateDescriptorsType)(XGL_DESCRIPTOR_SET descriptorSet, const void* pUpdateChain);
 typedef XGL_RESULT (XGLAPI *xglCreateDynamicViewportStateType)(XGL_DEVICE device, const XGL_DYNAMIC_VP_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_VP_STATE_OBJECT* pState);
 typedef XGL_RESULT (XGLAPI *xglCreateDynamicRasterStateType)(XGL_DEVICE device, const XGL_DYNAMIC_RS_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_RS_STATE_OBJECT* pState);
@@ -2701,26 +2701,26 @@ XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(
     const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList,
     XGL_DESCRIPTOR_SET_LAYOUT*                   pSetLayout);
 
-XGL_RESULT XGLAPI xglBeginDescriptorRegionUpdate(
+XGL_RESULT XGLAPI xglBeginDescriptorPoolUpdate(
     XGL_DEVICE                                   device,
     XGL_DESCRIPTOR_UPDATE_MODE                   updateMode);
 
-XGL_RESULT XGLAPI xglEndDescriptorRegionUpdate(
+XGL_RESULT XGLAPI xglEndDescriptorPoolUpdate(
     XGL_DEVICE                                   device,
     XGL_CMD_BUFFER                               cmd);
 
-XGL_RESULT XGLAPI xglCreateDescriptorRegion(
+XGL_RESULT XGLAPI xglCreateDescriptorPool(
     XGL_DEVICE                                   device,
-    XGL_DESCRIPTOR_REGION_USAGE                  regionUsage,
+    XGL_DESCRIPTOR_POOL_USAGE                    poolUsage,
     uint32_t                                     maxSets,
-    const XGL_DESCRIPTOR_REGION_CREATE_INFO*     pCreateInfo,
-    XGL_DESCRIPTOR_REGION*                       pDescriptorRegion);
+    const XGL_DESCRIPTOR_POOL_CREATE_INFO*       pCreateInfo,
+    XGL_DESCRIPTOR_POOL*                         pDescriptorPool);
 
-XGL_RESULT XGLAPI xglClearDescriptorRegion(
-    XGL_DESCRIPTOR_REGION                        descriptorRegion);
+XGL_RESULT XGLAPI xglClearDescriptorPool(
+    XGL_DESCRIPTOR_POOL                          descriptorPool);
 
 XGL_RESULT XGLAPI xglAllocDescriptorSets(
-    XGL_DESCRIPTOR_REGION                        descriptorRegion,
+    XGL_DESCRIPTOR_POOL                          descriptorPool,
     XGL_DESCRIPTOR_SET_USAGE                     setUsage,
     uint32_t                                     count,
     const XGL_DESCRIPTOR_SET_LAYOUT*             pSetLayouts,
@@ -2728,7 +2728,7 @@ XGL_RESULT XGLAPI xglAllocDescriptorSets(
     uint32_t*                                    pCount);
 
 void XGLAPI xglClearDescriptorSets(
-    XGL_DESCRIPTOR_REGION                        descriptorRegion,
+    XGL_DESCRIPTOR_POOL                          descriptorPool,
     uint32_t                                     count,
     const XGL_DESCRIPTOR_SET*                    pDescriptorSets);
 
diff --git a/include/xglDbg.h b/include/xglDbg.h
index be63828c..7e655e65 100644
--- a/include/xglDbg.h
+++ b/include/xglDbg.h
@@ -91,10 +91,10 @@ typedef enum _XGL_DBG_OBJECT_TYPE
     XGL_DBG_OBJECT_BUFFER,
     XGL_DBG_OBJECT_BUFFER_VIEW,
     XGL_DBG_OBJECT_DESCRIPTOR_SET_LAYOUT,
-    XGL_DBG_OBJECT_DESCRIPTOR_REGION,
+    XGL_DBG_OBJECT_DESCRIPTOR_POOL,
 
     XGL_DBG_OBJECT_TYPE_BEGIN_RANGE = XGL_DBG_OBJECT_UNKNOWN,
-    XGL_DBG_OBJECT_TYPE_END_RANGE   = XGL_DBG_OBJECT_DESCRIPTOR_REGION,
+    XGL_DBG_OBJECT_TYPE_END_RANGE   = XGL_DBG_OBJECT_DESCRIPTOR_POOL,
     XGL_NUM_DBG_OBJECT_TYPE         = (XGL_DBG_OBJECT_TYPE_END_RANGE - XGL_DBG_OBJECT_TYPE_BEGIN_RANGE + 1),
 } XGL_DBG_OBJECT_TYPE;
 
diff --git a/include/xglLayer.h b/include/xglLayer.h
index 5a25ca0e..3b7624d3 100644
--- a/include/xglLayer.h
+++ b/include/xglLayer.h
@@ -86,10 +86,10 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE
     xglLoadPipelineDerivativeType LoadPipelineDerivative;
     xglCreateSamplerType CreateSampler;
     xglCreateDescriptorSetLayoutType CreateDescriptorSetLayout;
-    xglBeginDescriptorRegionUpdateType BeginDescriptorRegionUpdate;
-    xglEndDescriptorRegionUpdateType EndDescriptorRegionUpdate;
-    xglCreateDescriptorRegionType CreateDescriptorRegion;
-    xglClearDescriptorRegionType ClearDescriptorRegion;
+    xglBeginDescriptorPoolUpdateType BeginDescriptorPoolUpdate;
+    xglEndDescriptorPoolUpdateType EndDescriptorPoolUpdate;
+    xglCreateDescriptorPoolType CreateDescriptorPool;
+    xglClearDescriptorPoolType ClearDescriptorPool;
     xglAllocDescriptorSetsType AllocDescriptorSets;
     xglClearDescriptorSetsType ClearDescriptorSets;
     xglUpdateDescriptorsType UpdateDescriptors;