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.

diff --git a/demos/cube.c b/demos/cube.c
index ae95e7f453b47589ceb55cb75a2ace1f79840d74..9bf56af58064c46133811230d4ce930a1a59454e 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -261,7 +261,7 @@ struct demo {
     float spin_increment;
     bool pause;
 
-    XGL_DESCRIPTOR_REGION desc_region;
+    XGL_DESCRIPTOR_POOL desc_pool;
     XGL_DESCRIPTOR_SET desc_set;
 
     xcb_window_t window;
@@ -1512,7 +1512,7 @@ static void demo_prepare_dynamic_states(struct demo *demo)
     assert(!err);
 }
 
-static void demo_prepare_descriptor_region(struct demo *demo)
+static void demo_prepare_descriptor_pool(struct demo *demo)
 {
     const XGL_DESCRIPTOR_TYPE_COUNT type_counts[2] = {
         [0] = {
@@ -1524,17 +1524,17 @@ static void demo_prepare_descriptor_region(struct demo *demo)
             .count = DEMO_TEXTURE_COUNT,
         },
     };
-    const XGL_DESCRIPTOR_REGION_CREATE_INFO descriptor_region = {
-        .sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_REGION_CREATE_INFO,
+    const XGL_DESCRIPTOR_POOL_CREATE_INFO descriptor_pool = {
+        .sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = NULL,
         .count = 2,
         .pTypeCount = type_counts,
     };
     XGL_RESULT err;
 
-    err = xglCreateDescriptorRegion(demo->device,
-            XGL_DESCRIPTOR_REGION_USAGE_ONE_SHOT, 1,
-            &descriptor_region, &demo->desc_region);
+    err = xglCreateDescriptorPool(demo->device,
+            XGL_DESCRIPTOR_POOL_USAGE_ONE_SHOT, 1,
+            &descriptor_pool, &demo->desc_pool);
     assert(!err);
 }
 
@@ -1573,19 +1573,19 @@ static void demo_prepare_descriptor_set(struct demo *demo)
     update_fs.count = DEMO_TEXTURE_COUNT;
     update_fs.pSamplerImageViews = combined_info;
 
-    err = xglAllocDescriptorSets(demo->desc_region,
+    err = xglAllocDescriptorSets(demo->desc_pool,
             XGL_DESCRIPTOR_SET_USAGE_STATIC,
             1, &demo->desc_layout,
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    xglBeginDescriptorRegionUpdate(demo->device,
+    xglBeginDescriptorPoolUpdate(demo->device,
             XGL_DESCRIPTOR_UPDATE_MODE_FASTEST);
 
-    xglClearDescriptorSets(demo->desc_region, 1, &demo->desc_set);
+    xglClearDescriptorSets(demo->desc_pool, 1, &demo->desc_set);
     xglUpdateDescriptors(demo->desc_set, &update_vs);
 
-    xglEndDescriptorRegionUpdate(demo->device, demo->buffers[demo->current_buffer].cmd);
+    xglEndDescriptorPoolUpdate(demo->device, demo->buffers[demo->current_buffer].cmd);
 }
 
 static void demo_prepare(struct demo *demo)
@@ -1612,7 +1612,7 @@ static void demo_prepare(struct demo *demo)
         assert(!err);
     }
 
-    demo_prepare_descriptor_region(demo);
+    demo_prepare_descriptor_pool(demo);
     demo_prepare_descriptor_set(demo);
 
 
@@ -1883,7 +1883,7 @@ static void demo_cleanup(struct demo *demo)
     uint32_t i, j;
 
     xglDestroyObject(demo->desc_set);
-    xglDestroyObject(demo->desc_region);
+    xglDestroyObject(demo->desc_pool);
 
     xglDestroyObject(demo->viewport);
     xglDestroyObject(demo->raster);

diff --git a/demos/tri.c b/demos/tri.c
index b5f1387dc892c9a482d3e78d73a9a647d943d11b..a643d75c00f6c34be0ea12e5d0554decb44e117b 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -88,7 +88,7 @@ struct demo {
     XGL_DYNAMIC_CB_STATE_OBJECT color_blend;
     XGL_DYNAMIC_DS_STATE_OBJECT depth_stencil;
 
-    XGL_DESCRIPTOR_REGION desc_region;
+    XGL_DESCRIPTOR_POOL desc_pool;
     XGL_DESCRIPTOR_SET desc_set;
 
     xcb_window_t window;
@@ -1087,23 +1087,23 @@ static void demo_prepare_dynamic_states(struct demo *demo)
     assert(!err);
 }
 
-static void demo_prepare_descriptor_region(struct demo *demo)
+static void demo_prepare_descriptor_pool(struct demo *demo)
 {
     const XGL_DESCRIPTOR_TYPE_COUNT type_count = {
         .type = XGL_DESCRIPTOR_TYPE_SAMPLER_TEXTURE,
         .count = DEMO_TEXTURE_COUNT,
     };
-    const XGL_DESCRIPTOR_REGION_CREATE_INFO descriptor_region = {
-        .sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_REGION_CREATE_INFO,
+    const XGL_DESCRIPTOR_POOL_CREATE_INFO descriptor_pool = {
+        .sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = NULL,
         .count = 1,
         .pTypeCount = &type_count,
     };
     XGL_RESULT err;
 
-    err = xglCreateDescriptorRegion(demo->device,
-            XGL_DESCRIPTOR_REGION_USAGE_ONE_SHOT, 1,
-            &descriptor_region, &demo->desc_region);
+    err = xglCreateDescriptorPool(demo->device,
+            XGL_DESCRIPTOR_POOL_USAGE_ONE_SHOT, 1,
+            &descriptor_pool, &demo->desc_pool);
     assert(!err);
 }
 
@@ -1131,19 +1131,19 @@ static void demo_prepare_descriptor_set(struct demo *demo)
     update.count = DEMO_TEXTURE_COUNT;
     update.pSamplerImageViews = combined_info;
 
-    err = xglAllocDescriptorSets(demo->desc_region,
+    err = xglAllocDescriptorSets(demo->desc_pool,
             XGL_DESCRIPTOR_SET_USAGE_STATIC,
             1, &demo->desc_layout,
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    xglBeginDescriptorRegionUpdate(demo->device,
+    xglBeginDescriptorPoolUpdate(demo->device,
             XGL_DESCRIPTOR_UPDATE_MODE_FASTEST);
 
-    xglClearDescriptorSets(demo->desc_region, 1, &demo->desc_set);
+    xglClearDescriptorSets(demo->desc_pool, 1, &demo->desc_set);
     xglUpdateDescriptors(demo->desc_set, &update);
 
-    xglEndDescriptorRegionUpdate(demo->device, demo->cmd);
+    xglEndDescriptorPoolUpdate(demo->device, demo->cmd);
 }
 
 static void demo_prepare(struct demo *demo)
@@ -1167,7 +1167,7 @@ static void demo_prepare(struct demo *demo)
     err = xglCreateCommandBuffer(demo->device, &cmd, &demo->cmd);
     assert(!err);
 
-    demo_prepare_descriptor_region(demo);
+    demo_prepare_descriptor_pool(demo);
     demo_prepare_descriptor_set(demo);
 }
 
@@ -1390,7 +1390,7 @@ static void demo_cleanup(struct demo *demo)
     uint32_t i, j;
 
     xglDestroyObject(demo->desc_set);
-    xglDestroyObject(demo->desc_region);
+    xglDestroyObject(demo->desc_pool);
 
     xglDestroyObject(demo->cmd);
 

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 72be459967ff1e827d000352069f146a3a0c77f3..1f9309e228e1b01a07015dc0581191a96ebdd9d5 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -211,21 +211,21 @@ static enum nulldrv_ext_type nulldrv_gpu_lookup_extension(const struct nulldrv_g
     return type;
 }
 
-static XGL_RESULT nulldrv_desc_pool_create(struct nulldrv_dev *dev,
-                                  struct nulldrv_desc_pool **pool_ret)
+static XGL_RESULT nulldrv_desc_ooxx_create(struct nulldrv_dev *dev,
+                                  struct nulldrv_desc_ooxx **ooxx_ret)
 {
-    struct nulldrv_desc_pool *pool;
+    struct nulldrv_desc_ooxx *ooxx;
 
-    pool = malloc(sizeof(*pool));
-    if (!pool) 
+    ooxx = malloc(sizeof(*ooxx));
+    if (!ooxx) 
         return XGL_ERROR_OUT_OF_MEMORY;
 
-    memset(pool, 0, sizeof(*pool));
+    memset(ooxx, 0, sizeof(*ooxx));
 
-    pool->surface_desc_size = 0;
-    pool->sampler_desc_size = 0;
+    ooxx->surface_desc_size = 0;
+    ooxx->sampler_desc_size = 0;
 
-    *pool_ret = pool; 
+    *ooxx_ret = ooxx; 
 
     return XGL_SUCCESS;
 }
@@ -253,7 +253,7 @@ static XGL_RESULT nulldrv_dev_create(struct nulldrv_gpu *gpu,
         dev->exts[ext] = true;
     }
 
-    ret = nulldrv_desc_pool_create(dev, &dev->desc_pool);
+    ret = nulldrv_desc_ooxx_create(dev, &dev->desc_ooxx);
     if (ret != XGL_SUCCESS) {
         return ret;
     }
@@ -697,29 +697,29 @@ static XGL_RESULT nulldrv_cmd_create(struct nulldrv_dev *dev,
     return XGL_SUCCESS;
 }
 
-static XGL_RESULT nulldrv_desc_region_create(struct nulldrv_dev *dev,
-                                    XGL_DESCRIPTOR_REGION_USAGE usage,
+static XGL_RESULT nulldrv_desc_pool_create(struct nulldrv_dev *dev,
+                                    XGL_DESCRIPTOR_POOL_USAGE usage,
                                     uint32_t max_sets,
-                                    const XGL_DESCRIPTOR_REGION_CREATE_INFO *info,
-                                    struct nulldrv_desc_region **region_ret)
+                                    const XGL_DESCRIPTOR_POOL_CREATE_INFO *info,
+                                    struct nulldrv_desc_pool **pool_ret)
 {
-    struct nulldrv_desc_region *region;
+    struct nulldrv_desc_pool *pool;
 
-    region = (struct nulldrv_desc_region *)
-        nulldrv_base_create(dev, sizeof(*region),
-                XGL_DBG_OBJECT_DESCRIPTOR_REGION);
-    if (!region)
+    pool = (struct nulldrv_desc_pool *)
+        nulldrv_base_create(dev, sizeof(*pool),
+                XGL_DBG_OBJECT_DESCRIPTOR_POOL);
+    if (!pool)
         return XGL_ERROR_OUT_OF_MEMORY;
 
-    region->dev = dev;
+    pool->dev = dev;
 
-    *region_ret = region;
+    *pool_ret = pool;
 
     return XGL_SUCCESS;
 }
 
 static XGL_RESULT nulldrv_desc_set_create(struct nulldrv_dev *dev,
-                                 struct nulldrv_desc_region *region,
+                                 struct nulldrv_desc_pool *pool,
                                  XGL_DESCRIPTOR_SET_USAGE usage,
                                  const struct nulldrv_desc_layout *layout,
                                  struct nulldrv_desc_set **set_ret)
@@ -732,16 +732,16 @@ static XGL_RESULT nulldrv_desc_set_create(struct nulldrv_dev *dev,
     if (!set)
         return XGL_ERROR_OUT_OF_MEMORY;
 
-    set->pool = dev->desc_pool;
+    set->ooxx = dev->desc_ooxx;
     set->layout = layout;
     *set_ret = set;
 
     return XGL_SUCCESS;
 }
 
-static struct nulldrv_desc_region *nulldrv_desc_region(XGL_DESCRIPTOR_REGION region)
+static struct nulldrv_desc_pool *nulldrv_desc_pool(XGL_DESCRIPTOR_POOL pool)
 {
-    return (struct nulldrv_desc_region *) region;
+    return (struct nulldrv_desc_pool *) pool;
 }
 
 static XGL_RESULT nulldrv_fb_create(struct nulldrv_dev *dev,
@@ -1899,7 +1899,7 @@ ICD_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(
             (struct nulldrv_desc_layout **) pSetLayout);
 }
 
-ICD_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorRegionUpdate(
+ICD_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorPoolUpdate(
     XGL_DEVICE                                   device,
     XGL_DESCRIPTOR_UPDATE_MODE                   updateMode)
 {
@@ -1907,7 +1907,7 @@ ICD_EXPORT XGL_RESULT XGLAPI xglBeginDescriptorRegionUpdate(
     return XGL_SUCCESS;
 }
 
-ICD_EXPORT XGL_RESULT XGLAPI xglEndDescriptorRegionUpdate(
+ICD_EXPORT XGL_RESULT XGLAPI xglEndDescriptorPoolUpdate(
     XGL_DEVICE                                   device,
     XGL_CMD_BUFFER                               cmd_)
 {
@@ -1915,29 +1915,29 @@ ICD_EXPORT XGL_RESULT XGLAPI xglEndDescriptorRegionUpdate(
     return XGL_SUCCESS;
 }
 
-ICD_EXPORT XGL_RESULT XGLAPI xglCreateDescriptorRegion(
+ICD_EXPORT 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)
 {
     NULLDRV_LOG_FUNC;
     struct nulldrv_dev *dev = nulldrv_dev(device);
 
-    return nulldrv_desc_region_create(dev, regionUsage, maxSets, pCreateInfo,
-            (struct nulldrv_desc_region **) pDescriptorRegion);
+    return nulldrv_desc_pool_create(dev, poolUsage, maxSets, pCreateInfo,
+            (struct nulldrv_desc_pool **) pDescriptorPool);
 }
 
-ICD_EXPORT XGL_RESULT XGLAPI xglClearDescriptorRegion(
-    XGL_DESCRIPTOR_REGION                        descriptorRegion)
+ICD_EXPORT XGL_RESULT XGLAPI xglClearDescriptorPool(
+    XGL_DESCRIPTOR_POOL                        descriptorPool)
 {
     NULLDRV_LOG_FUNC;
     return XGL_SUCCESS;
 }
 
 ICD_EXPORT 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,
@@ -1945,8 +1945,8 @@ ICD_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(
     uint32_t*                                    pCount)
 {
     NULLDRV_LOG_FUNC;
-    struct nulldrv_desc_region *region = nulldrv_desc_region(descriptorRegion);
-    struct nulldrv_dev *dev = region->dev;
+    struct nulldrv_desc_pool *pool = nulldrv_desc_pool(descriptorPool);
+    struct nulldrv_dev *dev = pool->dev;
     XGL_RESULT ret = XGL_SUCCESS;
     uint32_t i;
 
@@ -1954,7 +1954,7 @@ ICD_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(
         const struct nulldrv_desc_layout *layout =
             nulldrv_desc_layout((XGL_DESCRIPTOR_SET_LAYOUT) pSetLayouts[i]);
 
-        ret = nulldrv_desc_set_create(dev, region, setUsage, layout,
+        ret = nulldrv_desc_set_create(dev, pool, setUsage, layout,
                 (struct nulldrv_desc_set **) &pDescriptorSets[i]);
         if (ret != XGL_SUCCESS)
             break;
@@ -1967,7 +1967,7 @@ ICD_EXPORT XGL_RESULT XGLAPI xglAllocDescriptorSets(
 }
 
 ICD_EXPORT void XGLAPI xglClearDescriptorSets(
-    XGL_DESCRIPTOR_REGION                        descriptorRegion,
+    XGL_DESCRIPTOR_POOL                        descriptorPool,
     uint32_t                                     count,
     const XGL_DESCRIPTOR_SET*                    pDescriptorSets)
 {

diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h
index 8930a5ce6637da706c56ec91f5aec5cb510284c0..b398ba34dce1689b1afcac86078369c119f1bdae 100644 (file)
--- a/icd/nulldrv/nulldrv.h
+++ b/icd/nulldrv/nulldrv.h
@@ -75,11 +75,11 @@ struct nulldrv_gpu {
 struct nulldrv_dev {
      struct nulldrv_base base;
      bool exts[NULLDRV_EXT_COUNT];
-     struct nulldrv_desc_pool *desc_pool;
+     struct nulldrv_desc_ooxx *desc_ooxx;
      struct nulldrv_queue *queues[1];
 };
 
-struct nulldrv_desc_pool {
+struct nulldrv_desc_ooxx {
     uint32_t surface_desc_size;
     uint32_t sampler_desc_size;
 };
@@ -174,14 +174,14 @@ struct nulldrv_cmd {
     struct nulldrv_obj obj;
 };
 
-struct nulldrv_desc_region {
+struct nulldrv_desc_pool {
     struct nulldrv_obj obj;
     struct nulldrv_dev *dev;
 };
 
 struct nulldrv_desc_set {
     struct nulldrv_obj obj;
-    struct nulldrv_desc_pool *pool;
+    struct nulldrv_desc_ooxx *ooxx;
     const struct nulldrv_desc_layout *layout;
 };
 

diff --git a/include/xgl.h b/include/xgl.h
index c9c27917fb96ad468b4ceda464b62ceaee5c240f..a9314ec4e03d377dc126780b8e63c9658f3c211c 100644 (file)
--- 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 be63828c673cfa6d3980fafd086b8bb9191cb0ce..7e655e65cc4522d9c0be338596185878be3bc197 100644 (file)
--- 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 5a25ca0ea3d321ddfda0aee02afe226ab9bc6407..3b7624d335f037d4c19c78edba678b342d8eeed4 100644 (file)
--- 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;

diff --git a/xgl.py b/xgl.py
index b150b17c6fe6f4af811c8366adb918aaf85fe339..e76c545ad0ba43f3700d231a3218c6fd461d06b2 100644 (file)
--- a/xgl.py
+++ b/xgl.py
@@ -201,7 +201,7 @@ core = Extension(
         "XGL_SAMPLER",
         "XGL_DESCRIPTOR_SET",
         "XGL_DESCRIPTOR_SET_LAYOUT",
-        "XGL_DESCRIPTOR_REGION",
+        "XGL_DESCRIPTOR_POOL",
         "XGL_DYNAMIC_STATE_OBJECT",
         "XGL_DYNAMIC_VP_STATE_OBJECT",
         "XGL_DYNAMIC_RS_STATE_OBJECT",
@@ -517,26 +517,26 @@ core = Extension(
              Param("const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*", "pSetLayoutInfoList"),
              Param("XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayout")]),
 
-        Proto("XGL_RESULT", "BeginDescriptorRegionUpdate",
+        Proto("XGL_RESULT", "BeginDescriptorPoolUpdate",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_DESCRIPTOR_UPDATE_MODE", "updateMode")]),
 
-        Proto("XGL_RESULT", "EndDescriptorRegionUpdate",
+        Proto("XGL_RESULT", "EndDescriptorPoolUpdate",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_CMD_BUFFER", "cmd")]),
 
-        Proto("XGL_RESULT", "CreateDescriptorRegion",
+        Proto("XGL_RESULT", "CreateDescriptorPool",
             [Param("XGL_DEVICE", "device"),
-             Param("XGL_DESCRIPTOR_REGION_USAGE", "regionUsage"),
+             Param("XGL_DESCRIPTOR_POOL_USAGE", "poolUsage"),
              Param("uint32_t", "maxSets"),
-             Param("const XGL_DESCRIPTOR_REGION_CREATE_INFO*", "pCreateInfo"),
-             Param("XGL_DESCRIPTOR_REGION*", "pDescriptorRegion")]),
+             Param("const XGL_DESCRIPTOR_POOL_CREATE_INFO*", "pCreateInfo"),
+             Param("XGL_DESCRIPTOR_POOL*", "pDescriptorPool")]),
 
-        Proto("XGL_RESULT", "ClearDescriptorRegion",
-            [Param("XGL_DESCRIPTOR_REGION", "descriptorRegion")]),
+        Proto("XGL_RESULT", "ClearDescriptorPool",
+            [Param("XGL_DESCRIPTOR_POOL", "descriptorPool")]),
 
         Proto("XGL_RESULT", "AllocDescriptorSets",
-            [Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
+            [Param("XGL_DESCRIPTOR_POOL", "descriptorPool"),
              Param("XGL_DESCRIPTOR_SET_USAGE", "setUsage"),
              Param("uint32_t", "count"),
              Param("const XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayouts"),
@@ -544,7 +544,7 @@ core = Extension(
              Param("uint32_t*", "pCount")]),
 
         Proto("void", "ClearDescriptorSets",
-            [Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
+            [Param("XGL_DESCRIPTOR_POOL", "descriptorPool"),
              Param("uint32_t", "count"),
              Param("const XGL_DESCRIPTOR_SET*", "pDescriptorSets")]),