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/include/xgl.h b/include/xgl.h
index c9c2791..a9314ec 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -72,7 +72,7 @@
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 @@
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 @@
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 @@
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 *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 @@
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 @@
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 be63828..7e655e6 100644
--- a/include/xglDbg.h
+++ b/include/xglDbg.h
@@ -91,10 +91,10 @@
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 5a25ca0..3b7624d 100644
--- a/include/xglLayer.h
+++ b/include/xglLayer.h
@@ -86,10 +86,10 @@
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/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index a2ad76f..67f4d7a 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -328,12 +328,12 @@
void XglDescriptorSetObj::CreateXGLDescriptorSet(XglCommandBufferObj *cmdBuffer)
{
- // create XGL_DESCRIPTOR_REGION
- XGL_DESCRIPTOR_REGION_CREATE_INFO region = {};
- region.sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_REGION_CREATE_INFO;
- region.count = m_type_counts.size();
- region.pTypeCount = &m_type_counts[0];
- init(*m_device, XGL_DESCRIPTOR_REGION_USAGE_ONE_SHOT, 1, region);
+ // create XGL_DESCRIPTOR_POOL
+ XGL_DESCRIPTOR_POOL_CREATE_INFO pool = {};
+ pool.sType = XGL_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+ pool.count = m_type_counts.size();
+ pool.pTypeCount = &m_type_counts[0];
+ init(*m_device, XGL_DESCRIPTOR_POOL_USAGE_ONE_SHOT, 1, pool);
// create XGL_DESCRIPTOR_SET_LAYOUT
vector<XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO> layout;
@@ -380,10 +380,10 @@
NULL;
// do the updates
- m_device->begin_descriptor_region_update(XGL_DESCRIPTOR_UPDATE_MODE_FASTEST);
+ m_device->begin_descriptor_pool_update(XGL_DESCRIPTOR_UPDATE_MODE_FASTEST);
clear_sets(*m_set);
m_set->update(chain);
- m_device->end_descriptor_region_update(*cmdBuffer);
+ m_device->end_descriptor_pool_update(*cmdBuffer);
}
XglImage::XglImage(XglDevice *dev)
diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 00343a0..1c8da22 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -307,7 +307,7 @@
};
-class XglDescriptorSetObj : public xgl_testing::DescriptorRegion
+class XglDescriptorSetObj : public xgl_testing::DescriptorPool
{
public:
XglDescriptorSetObj(XglDevice *device);
diff --git a/tests/xgltestbinding.cpp b/tests/xgltestbinding.cpp
index f92faae..1331d00 100644
--- a/tests/xgltestbinding.cpp
+++ b/tests/xgltestbinding.cpp
@@ -503,14 +503,14 @@
return err;
}
-void Device::begin_descriptor_region_update(XGL_DESCRIPTOR_UPDATE_MODE mode)
+void Device::begin_descriptor_pool_update(XGL_DESCRIPTOR_UPDATE_MODE mode)
{
- EXPECT(xglBeginDescriptorRegionUpdate(obj(), mode) == XGL_SUCCESS);
+ EXPECT(xglBeginDescriptorPoolUpdate(obj(), mode) == XGL_SUCCESS);
}
-void Device::end_descriptor_region_update(CmdBuffer &cmd)
+void Device::end_descriptor_pool_update(CmdBuffer &cmd)
{
- EXPECT(xglEndDescriptorRegionUpdate(obj(), cmd.obj()) == XGL_SUCCESS);
+ EXPECT(xglEndDescriptorPoolUpdate(obj(), cmd.obj()) == XGL_SUCCESS);
}
void Queue::submit(const std::vector<const CmdBuffer *> &cmds, const std::vector<XGL_MEMORY_REF> &mem_refs, Fence &fence)
@@ -836,19 +836,19 @@
init(dev, XGL_SHADER_STAGE_FLAGS_ALL, std::vector<uint32_t>(1, bind_point), prior_layout, info);
}
-void DescriptorRegion::init(const Device &dev, XGL_DESCRIPTOR_REGION_USAGE usage,
- uint32_t max_sets, const XGL_DESCRIPTOR_REGION_CREATE_INFO &info)
+void DescriptorPool::init(const Device &dev, XGL_DESCRIPTOR_POOL_USAGE usage,
+ uint32_t max_sets, const XGL_DESCRIPTOR_POOL_CREATE_INFO &info)
{
- DERIVED_OBJECT_INIT(xglCreateDescriptorRegion, dev.obj(), usage, max_sets, &info);
+ DERIVED_OBJECT_INIT(xglCreateDescriptorPool, dev.obj(), usage, max_sets, &info);
alloc_memory(dev);
}
-void DescriptorRegion::clear()
+void DescriptorPool::clear()
{
- EXPECT(xglClearDescriptorRegion(obj()) == XGL_SUCCESS);
+ EXPECT(xglClearDescriptorPool(obj()) == XGL_SUCCESS);
}
-std::vector<DescriptorSet *> DescriptorRegion::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const std::vector<const DescriptorSetLayout *> &layouts)
+std::vector<DescriptorSet *> DescriptorPool::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const std::vector<const DescriptorSetLayout *> &layouts)
{
const std::vector<XGL_DESCRIPTOR_SET_LAYOUT> layout_objs = make_objects<XGL_DESCRIPTOR_SET_LAYOUT>(layouts);
@@ -871,18 +871,18 @@
return sets;
}
-std::vector<DescriptorSet *> DescriptorRegion::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const DescriptorSetLayout &layout, uint32_t count)
+std::vector<DescriptorSet *> DescriptorPool::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const DescriptorSetLayout &layout, uint32_t count)
{
return alloc_sets(usage, std::vector<const DescriptorSetLayout *>(count, &layout));
}
-DescriptorSet *DescriptorRegion::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const DescriptorSetLayout &layout)
+DescriptorSet *DescriptorPool::alloc_sets(XGL_DESCRIPTOR_SET_USAGE usage, const DescriptorSetLayout &layout)
{
std::vector<DescriptorSet *> set = alloc_sets(usage, layout, 1);
return (set.empty()) ? NULL : set[0];
}
-void DescriptorRegion::clear_sets(const std::vector<DescriptorSet *> &sets)
+void DescriptorPool::clear_sets(const std::vector<DescriptorSet *> &sets)
{
const std::vector<XGL_DESCRIPTOR_SET> set_objs = make_objects<XGL_DESCRIPTOR_SET>(sets);
xglClearDescriptorSets(obj(), set_objs.size(), &set_objs[0]);
diff --git a/tests/xgltestbinding.h b/tests/xgltestbinding.h
index 023dcfb..36352b4 100644
--- a/tests/xgltestbinding.h
+++ b/tests/xgltestbinding.h
@@ -54,7 +54,7 @@
class PipelineDelta;
class Sampler;
class DescriptorSetLayout;
-class DescriptorSetRegion;
+class DescriptorSetPool;
class DescriptorSet;
class DynamicVpStateObject;
class DynamicRsStateObject;
@@ -227,10 +227,10 @@
XGL_RESULT wait(const std::vector<const Fence *> &fences, bool wait_all, uint64_t timeout);
XGL_RESULT wait(const Fence &fence) { return wait(std::vector<const Fence *>(1, &fence), true, (uint64_t) -1); }
- // xglBeginDescriptorRegionUpdate()
- // xglEndDescriptorRegionUpdate()
- void begin_descriptor_region_update(XGL_DESCRIPTOR_UPDATE_MODE mode);
- void end_descriptor_region_update(CmdBuffer &cmd);
+ // xglBeginDescriptorPoolUpdate()
+ // xglEndDescriptorPoolUpdate()
+ void begin_descriptor_pool_update(XGL_DESCRIPTOR_UPDATE_MODE mode);
+ void end_descriptor_pool_update(CmdBuffer &cmd);
private:
enum QueueIndex {
@@ -511,13 +511,13 @@
const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO &info) { init(dev, bind_point, DescriptorSetLayout(), info); }
};
-class DescriptorRegion : public DerivedObject<XGL_DESCRIPTOR_REGION, Object> {
+class DescriptorPool : public DerivedObject<XGL_DESCRIPTOR_POOL, Object> {
public:
- // xglCreateDescriptorRegion()
- void init(const Device &dev, XGL_DESCRIPTOR_REGION_USAGE usage,
- uint32_t max_sets, const XGL_DESCRIPTOR_REGION_CREATE_INFO &info);
+ // xglCreateDescriptorPool()
+ void init(const Device &dev, XGL_DESCRIPTOR_POOL_USAGE usage,
+ uint32_t max_sets, const XGL_DESCRIPTOR_POOL_CREATE_INFO &info);
- // xglClearDescriptorRegion()
+ // xglClearDescriptorPool()
void clear();
// xglAllocDescriptorSets()
diff --git a/xgl.py b/xgl.py
index b150b17..e76c545 100644
--- a/xgl.py
+++ b/xgl.py
@@ -201,7 +201,7 @@
"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 @@
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 @@
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")]),