xgl: Remove XGL_* typedef wrappers
Part of moving to xgl.h rev#38, svn rev 29293-29302
diff --git a/docs/xgl_ds.dot b/docs/xgl_ds.dot
index befb0e4..e7496de 100644
--- a/docs/xgl_ds.dot
+++ b/docs/xgl_ds.dot
@@ -12,27 +12,27 @@
{
label="xglCreateDescriptorSet()"
"_XGL_DESCRIPTOR_SET_CREATE_INFO1" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">XGL_UINT</TD><TD PORT="f4">slots=14</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">uint32_t</TD><TD PORT="f4">slots=14</TD></TR></TABLE>>
];
}
subgraph clusterDSCreate2
{
label="xglCreateDescriptorSet()"
"_XGL_DESCRIPTOR_SET_CREATE_INFO2" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">XGL_UINT</TD><TD PORT="f4">slots=20</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">uint32_t</TD><TD PORT="f4">slots=20</TD></TR></TABLE>>
];
}
subgraph clusterSamplerCreate
{
label="xglCreateSampler - multiple calls return unique XGL_SAMPLER handles"
"_XGL_SAMPLER_CREATE_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">XGL_FLOAT</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">XGL_FLOAT</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">XGL_FLOAT</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">float</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">float</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">float</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
"SAMPLER_ELLIPSES" [
label = "..."
];
"_XGL_SAMPLER_CREATE_INFO_19" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">XGL_FLOAT</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">XGL_FLOAT</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">XGL_FLOAT</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">float</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">float</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">float</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
}
subgraph clusterSamplerAttach
@@ -52,45 +52,45 @@
{
label="xglAttachMemoryViewDescriptors - pMemViews array of XGL_MEMORY_VIEW_ATTACH_INFO structs"
"_XGL_MEMORY_VIEW_ATTACH_INFO_3" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
"MEM_VIEW_ELLIPSES" [
label = "..."
];
"_XGL_MEMORY_VIEW_ATTACH_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
}
subgraph clusterImageView
{
label="xglAttachImageViewDescriptors - pImageViews array of XGL_IMAGE_VIEW_ATTACH_INFO structs"
"_XGL_IMAGE_VIEW_ATTACH_INFO_9" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
"IMG_VIEW_ELLIPSES" [
label = "..."
];
"_XGL_IMAGE_VIEW_ATTACH_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
}
"VS_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=2</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=2</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"VS_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR></TABLE>>
];
"FS0_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=6</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=6</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS0_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">XGL_UINT</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">XGL_UINT</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_UAV</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">XGL_UINT</TD><TD PORT="f30">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">uint32_t</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">uint32_t</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_UAV</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">uint32_t</TD><TD PORT="f30">shaderEntityIndex</TD></TR></TABLE>>
];
"FS1_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=10</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=10</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS1_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">XGL_UINT</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">XGL_UINT</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">XGL_UINT</TD><TD PORT="f30">shaderEntityIndex</TD></TR><TR><TD PORT="f32">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f33">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f31">6</TD></TR><TR><TD PORT="f34">XGL_UINT</TD><TD PORT="f35">shaderEntityIndex</TD></TR><TR><TD PORT="f37">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f38">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f36">7</TD></TR><TR><TD PORT="f39">XGL_UINT</TD><TD PORT="f40">shaderEntityIndex</TD></TR><TR><TD PORT="f42">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f43">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f41">8</TD></TR><TR><TD PORT="f44">XGL_UINT</TD><TD PORT="f45">shaderEntityIndex</TD></TR><TR><TD PORT="f47">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f48">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f46">9</TD></TR><TR><TD PORT="f49">XGL_UINT</TD><TD PORT="f50">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">uint32_t</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">uint32_t</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">uint32_t</TD><TD PORT="f30">shaderEntityIndex</TD></TR><TR><TD PORT="f32">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f33">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f31">6</TD></TR><TR><TD PORT="f34">uint32_t</TD><TD PORT="f35">shaderEntityIndex</TD></TR><TR><TD PORT="f37">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f38">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f36">7</TD></TR><TR><TD PORT="f39">uint32_t</TD><TD PORT="f40">shaderEntityIndex</TD></TR><TR><TD PORT="f42">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f43">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f41">8</TD></TR><TR><TD PORT="f44">uint32_t</TD><TD PORT="f45">shaderEntityIndex</TD></TR><TR><TD PORT="f47">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f48">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f46">9</TD></TR><TR><TD PORT="f49">uint32_t</TD><TD PORT="f50">shaderEntityIndex</TD></TR></TABLE>>
];
/*
"_XGL_DESCRIPTOR_SET_CREATE_INFO1":f2 -> "_XGL_DESCRIPTOR_SET_CREATE_INFO2":f0 [
diff --git a/docs/xgl_full_pipeline_ds.dot b/docs/xgl_full_pipeline_ds.dot
index c0717c7..53ae866 100644
--- a/docs/xgl_full_pipeline_ds.dot
+++ b/docs/xgl_full_pipeline_ds.dot
@@ -9,52 +9,52 @@
edge [
];
"_XGL_GRAPHICS_PIPELINE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_FLAGS</TD><TD>flags</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_FLAGS</TD><TD>flags</TD></TR></TABLE>>
];
"_XGL_PIPELINE_IA_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_PRIMITIVE_TOPOLOGY</TD><TD>topology</TD></TR><TR><TD>XGL_BOOL</TD><TD>disableVertexReuse</TD></TR><TR><TD>XGL_PROVOKING_VERTEX_CONVENTION</TD><TD>provokingVertex</TD></TR><TR><TD>XGL_BOOL</TD><TD>primitiveRestartEnable</TD></TR><TR><TD>XGL_UINT32</TD><TD>primitiveRestartIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_PRIMITIVE_TOPOLOGY</TD><TD>topology</TD></TR><TR><TD>bool32_t</TD><TD>disableVertexReuse</TD></TR><TR><TD>XGL_PROVOKING_VERTEX_CONVENTION</TD><TD>provokingVertex</TD></TR><TR><TD>bool32_t</TD><TD>primitiveRestartEnable</TD></TR><TR><TD>uint32_t</TD><TD>primitiveRestartIndex</TD></TR></TABLE>>
];
"_XGL_PIPELINE_TESS_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_UINT</TD><TD>patchControlPoints</TD></TR> <TR><TD>XGL_FLOAT</TD><TD>optimalTessFactor</TD></TR><TR><TD>XGL_FLOAT</TD><TD>fixedTessFactor</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>uint32_t</TD><TD>patchControlPoints</TD></TR> <TR><TD>float</TD><TD>optimalTessFactor</TD></TR><TR><TD>float</TD><TD>fixedTessFactor</TD></TR></TABLE>>
];
"_XGL_PIPELINE_RS_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_RS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_BOOL</TD><TD>depthClipEnable</TD></TR> <TR><TD>XGL_BOOL</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>XGL_FLOAT</TD><TD>pointSize</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_RS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>depthClipEnable</TD></TR> <TR><TD>bool32_t</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>float</TD><TD>pointSize</TD></TR> </TABLE>>
];
"_XGL_PIPELINE_CB_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_CB_STATE</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_BOOL</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>XGL_BOOL</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>XGL_LOGIC_OP</TD><TD>logicOp</TD></TR> <TR><TD>XGL_PIPELINE_CB_ATTACHMENT_STATE</TD><TD>attachment</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_CB_STATE</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>XGL_LOGIC_OP</TD><TD>logicOp</TD></TR> <TR><TD>XGL_PIPELINE_CB_ATTACHMENT_STATE</TD><TD>attachment</TD></TR> </TABLE>>
];
"_XGL_PIPELINE_DB_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_FORMAT</TD><TD>format</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_FORMAT</TD><TD>format</TD></TR> </TABLE>>
];
"VS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"TC_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"TE_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"GS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"FS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"VS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=VS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=VS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"TC_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TC</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TC</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"TE_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TE</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TE</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"GS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=GS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=GS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"FS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=FS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=FS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"_XGL_GRAPHICS_PIPELINE_CREATE_INFO":f2 -> "_XGL_PIPELINE_IA_STATE_CREATE_INFO" [
id = 100
@@ -105,27 +105,27 @@
{
label="xglCreateDescriptorSet()"
"_XGL_DESCRIPTOR_SET_CREATE_INFO1" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">XGL_UINT</TD><TD PORT="f4">slots=14</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">uint32_t</TD><TD PORT="f4">slots=14</TD></TR></TABLE>>
];
}
subgraph clusterDSCreate2
{
label="xglCreateDescriptorSet()"
"_XGL_DESCRIPTOR_SET_CREATE_INFO2" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">XGL_UINT</TD><TD PORT="f4">slots=20</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR><TR><TD PORT="f3">uint32_t</TD><TD PORT="f4">slots=20</TD></TR></TABLE>>
];
}
subgraph clusterSamplerCreate
{
label="xglCreateSampler - multiple calls return unique XGL_SAMPLER handles"
"_XGL_SAMPLER_CREATE_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">XGL_FLOAT</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">XGL_FLOAT</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">XGL_FLOAT</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">float</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">float</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">float</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
"SAMPLER_ELLIPSES" [
label = "..."
];
"_XGL_SAMPLER_CREATE_INFO_19" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">XGL_FLOAT</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">XGL_FLOAT</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">XGL_FLOAT</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f3">const void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">XGL_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">XGL_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">XGL_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">XGL_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">XGL_TEX_ADDRESS</TD><TD PORT="f16">addressW</TD></TR><TR><TD PORT="f17">float</TD><TD PORT="f18">mipLodBias</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">maxAnisotropy</TD></TR><TR><TD PORT="f21">XGL_COMPARE_FUNC</TD><TD PORT="f22">compareFunc</TD></TR><TR><TD PORT="f23">float</TD><TD PORT="f24">minLod</TD></TR><TR><TD PORT="f25">float</TD><TD PORT="f26">maxLod</TD></TR><TR><TD PORT="f27">XGL_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
}
subgraph clusterSamplerAttach
@@ -145,45 +145,45 @@
{
label="xglAttachMemoryViewDescriptors - pMemViews array of XGL_MEMORY_VIEW_ATTACH_INFO structs"
"_XGL_MEMORY_VIEW_ATTACH_INFO_3" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
"MEM_VIEW_ELLIPSES" [
label = "..."
];
"_XGL_MEMORY_VIEW_ATTACH_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">XGL_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">XGL_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">XGL_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">XGL_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">XGL_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
}
subgraph clusterImageView
{
label="xglAttachImageViewDescriptors - pImageViews array of XGL_IMAGE_VIEW_ATTACH_INFO structs"
"_XGL_IMAGE_VIEW_ATTACH_INFO_9" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
"IMG_VIEW_ELLIPSES" [
label = "..."
];
"_XGL_IMAGE_VIEW_ATTACH_INFO_0" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">XGL_VOID*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">XGL_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f3">void*</TD><TD PORT="f4">pNext=NULL</TD></TR><TR><TD PORT="f5">XGL_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">XGL_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
}
"VS_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=2</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=2</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"VS_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR></TABLE>>
];
"FS0_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=6</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=6</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS0_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">XGL_UINT</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">XGL_UINT</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_UAV</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">XGL_UINT</TD><TD PORT="f30">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_UNUSED</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">uint32_t</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_RESOURCE</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">uint32_t</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_UAV</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">uint32_t</TD><TD PORT="f30">shaderEntityIndex</TD></TR></TABLE>>
];
"FS1_XGL_DESCRIPTOR_SET_MAPPING" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">XGL_UINT</TD><TD PORT="f2">descriptorCount=10</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=10</TD></TR><TR><TD PORT="f3">const XGL_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS1_XGL_DESCRIPTOR_SLOT_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">XGL_UINT</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">XGL_UINT</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">XGL_UINT</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">XGL_UINT</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">XGL_UINT</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">XGL_UINT</TD><TD PORT="f30">shaderEntityIndex</TD></TR><TR><TD PORT="f32">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f33">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f31">6</TD></TR><TR><TD PORT="f34">XGL_UINT</TD><TD PORT="f35">shaderEntityIndex</TD></TR><TR><TD PORT="f37">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f38">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f36">7</TD></TR><TR><TD PORT="f39">XGL_UINT</TD><TD PORT="f40">shaderEntityIndex</TD></TR><TR><TD PORT="f42">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f43">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f41">8</TD></TR><TR><TD PORT="f44">XGL_UINT</TD><TD PORT="f45">shaderEntityIndex</TD></TR><TR><TD PORT="f47">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f48">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f46">9</TD></TR><TR><TD PORT="f49">XGL_UINT</TD><TD PORT="f50">shaderEntityIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">XGL_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f1">0</TD></TR><TR><TD PORT="f4">uint32_t</TD><TD PORT="f5">shaderEntityIndex</TD></TR><TR><TD PORT="f7">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f6">1</TD></TR><TR><TD PORT="f9">uint32_t</TD><TD PORT="f10">shaderEntityIndex</TD></TR><TR><TD PORT="f12">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f11">2</TD></TR><TR><TD PORT="f14">uint32_t</TD><TD PORT="f15">shaderEntityIndex</TD></TR><TR><TD PORT="f17">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f16">3</TD></TR><TR><TD PORT="f19">uint32_t</TD><TD PORT="f20">shaderEntityIndex</TD></TR><TR><TD PORT="f22">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f21">4</TD></TR><TR><TD PORT="f24">uint32_t</TD><TD PORT="f25">shaderEntityIndex</TD></TR><TR><TD PORT="f27">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f26">5</TD></TR><TR><TD PORT="f29">uint32_t</TD><TD PORT="f30">shaderEntityIndex</TD></TR><TR><TD PORT="f32">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f33">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f31">6</TD></TR><TR><TD PORT="f34">uint32_t</TD><TD PORT="f35">shaderEntityIndex</TD></TR><TR><TD PORT="f37">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f38">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f36">7</TD></TR><TR><TD PORT="f39">uint32_t</TD><TD PORT="f40">shaderEntityIndex</TD></TR><TR><TD PORT="f42">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f43">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f41">8</TD></TR><TR><TD PORT="f44">uint32_t</TD><TD PORT="f45">shaderEntityIndex</TD></TR><TR><TD PORT="f47">XGL_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f48">XGL_SLOT_SHADER_SAMPLER</TD><TD ROWSPAN="2" PORT="f46">9</TD></TR><TR><TD PORT="f49">uint32_t</TD><TD PORT="f50">shaderEntityIndex</TD></TR></TABLE>>
];
/*
"_XGL_DESCRIPTOR_SET_CREATE_INFO1":f2 -> "_XGL_DESCRIPTOR_SET_CREATE_INFO2":f0 [
diff --git a/docs/xgl_graphics_pipeline.dot b/docs/xgl_graphics_pipeline.dot
index 18e74c0..e5434f6 100644
--- a/docs/xgl_graphics_pipeline.dot
+++ b/docs/xgl_graphics_pipeline.dot
@@ -9,52 +9,52 @@
edge [
];
"_XGL_GRAPHICS_PIPELINE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_FLAGS</TD><TD>flags</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_FLAGS</TD><TD>flags</TD></TR></TABLE>>
];
"_XGL_PIPELINE_IA_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_PRIMITIVE_TOPOLOGY</TD><TD>topology</TD></TR><TR><TD>XGL_BOOL</TD><TD>disableVertexReuse</TD></TR><TR><TD>XGL_PROVOKING_VERTEX_CONVENTION</TD><TD>provokingVertex</TD></TR><TR><TD>XGL_BOOL</TD><TD>primitiveRestartEnable</TD></TR><TR><TD>XGL_UINT32</TD><TD>primitiveRestartIndex</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_PRIMITIVE_TOPOLOGY</TD><TD>topology</TD></TR><TR><TD>bool32_t</TD><TD>disableVertexReuse</TD></TR><TR><TD>XGL_PROVOKING_VERTEX_CONVENTION</TD><TD>provokingVertex</TD></TR><TR><TD>bool32_t</TD><TD>primitiveRestartEnable</TD></TR><TR><TD>uint32_t</TD><TD>primitiveRestartIndex</TD></TR></TABLE>>
];
"_XGL_PIPELINE_TESS_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>XGL_UINT</TD><TD>patchControlPoints</TD></TR> <TR><TD>XGL_FLOAT</TD><TD>optimalTessFactor</TD></TR><TR><TD>XGL_FLOAT</TD><TD>fixedTessFactor</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO</TD></TR><TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR><TR><TD>uint32_t</TD><TD>patchControlPoints</TD></TR> <TR><TD>float</TD><TD>optimalTessFactor</TD></TR><TR><TD>float</TD><TD>fixedTessFactor</TD></TR></TABLE>>
];
"_XGL_PIPELINE_RS_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_RS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_BOOL</TD><TD>depthClipEnable</TD></TR> <TR><TD>XGL_BOOL</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>XGL_FLOAT</TD><TD>pointSize</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_RS_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>depthClipEnable</TD></TR> <TR><TD>bool32_t</TD><TD>rasterizerDiscardEnable</TD></TR> <TR><TD>float</TD><TD>pointSize</TD></TR> </TABLE>>
];
"_XGL_PIPELINE_CB_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_CB_STATE</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_BOOL</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>XGL_BOOL</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>XGL_LOGIC_OP</TD><TD>logicOp</TD></TR> <TR><TD>XGL_PIPELINE_CB_ATTACHMENT_STATE</TD><TD>attachment</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_CB_STATE</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>bool32_t</TD><TD>alphaToCoverageEnable</TD></TR> <TR><TD>bool32_t</TD><TD>dualSourceBlendEnable</TD></TR> <TR><TD>XGL_LOGIC_OP</TD><TD>logicOp</TD></TR> <TR><TD>XGL_PIPELINE_CB_ATTACHMENT_STATE</TD><TD>attachment</TD></TR> </TABLE>>
];
"_XGL_PIPELINE_DB_STATE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_FORMAT</TD><TD>format</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_DB_STATE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_FORMAT</TD><TD>format</TD></TR> </TABLE>>
];
"VS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"TC_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"TE_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"GS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"FS_XGL_PIPELINE_SHADER_STAGE_CREATE_INFO" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const XGL_VOID*</TD><TD PORT="f2">pNext=NULL</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR><TR><TD>XGL_STRUCTURE_TYPE</TD><TD>sType=<BR/>XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO</TD></TR> <TR><TD>const void*</TD><TD PORT="f2">pNext=NULL</TD></TR> <TR><TD>XGL_PIPELINE_SHADER</TD><TD PORT="f4">shader</TD></TR> </TABLE>>
];
"VS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=VS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=VS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"TC_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TC</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TC</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"TE_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TE</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=TE</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"GS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=GS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=GS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"FS_XGL_PIPELINE_SHADER" [
-label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=FS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">XGL_UINT</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
+label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">XGL_PIPELINE_SHADER</TD></TR><TR><TD PORT="f1">XGL_PIPELINE_SHADER_STAGE</TD><TD PORT="f2">stage=FS</TD></TR><TR><TD PORT="f3">XGL_SHADER</TD><TD PORT="f4">shader</TD></TR><TR><TD PORT="f5">XGL_DESCRIPTOR_SET_MAPPING</TD><TD PORT="f6">descriptorSetMapping[2]</TD></TR><TR><TD PORT="f7">uint32_t</TD><TD PORT="f8">linkConstBufferCount</TD></TR><TR><TD PORT="f9">const XGL_LINK_CONST_BUFFER*</TD><TD PORT="f10">pLinkConstBufferInfo</TD></TR><TR><TD PORT="f11">XGL_DYNAMIC_MEMORY_VIEW_SLOT_INFO</TD><TD PORT="f12">dynamicMemoryViewMapping</TD></TR></TABLE>>
];
"_XGL_GRAPHICS_PIPELINE_CREATE_INFO":f2 -> "_XGL_PIPELINE_IA_STATE_CREATE_INFO" [
id = 0
diff --git a/glave-generate.py b/glave-generate.py
index a52b197..3376c3b 100755
--- a/glave-generate.py
+++ b/glave-generate.py
@@ -97,7 +97,7 @@
# TODO : Need ENUM and STRUCT checks here
if "_TYPE" in xgl_type: # TODO : This should be generic ENUM check
return ("%s", "string_%s(%s)" % (xgl_type.strip('const ').strip('*'), name))
- if "XGL_CHAR*" == xgl_type:
+ if "char*" == xgl_type:
return ("%s", name)
if "UINT64" in xgl_type:
if '*' in xgl_type:
@@ -316,8 +316,8 @@
iae_body.append('GLVTRACER_EXPORT XGL_RESULT XGLAPI __HOOKED_xglInitAndEnumerateGpus(')
iae_body.append(' const XGL_APPLICATION_INFO* pAppInfo,')
iae_body.append(' const XGL_ALLOC_CALLBACKS* pAllocCb,')
- iae_body.append(' XGL_UINT maxGpus,')
- iae_body.append(' XGL_UINT* pGpuCount,')
+ iae_body.append(' uint32_t maxGpus,')
+ iae_body.append(' uint32_t* pGpuCount,')
iae_body.append(' XGL_PHYSICAL_GPU* pGpus)')
iae_body.append('{')
iae_body.append(' glv_trace_packet_header* pHeader;')
@@ -336,7 +336,7 @@
iae_body.append('')
iae_body.append(' // since we do not know how many gpus will be found must create trace packet after calling xglInit')
iae_body.append(' CREATE_TRACE_PACKET(xglInitAndEnumerateGpus, calc_size_XGL_APPLICATION_INFO(pAppInfo) + ((pAllocCb == NULL) ? 0 :sizeof(XGL_ALLOC_CALLBACKS))')
- iae_body.append(' + sizeof(XGL_UINT) + ((pGpus && pGpuCount) ? *pGpuCount * sizeof(XGL_PHYSICAL_GPU) : 0));')
+ iae_body.append(' + sizeof(uint32_t) + ((pGpus && pGpuCount) ? *pGpuCount * sizeof(XGL_PHYSICAL_GPU) : 0));')
iae_body.append(' pHeader->entrypoint_begin_time = startTime;')
iae_body.append(' if (isHooked == FALSE) {')
iae_body.append(' AttachHooks();')
@@ -349,7 +349,7 @@
iae_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pAllocCb), sizeof(XGL_ALLOC_CALLBACKS), pAllocCb);')
iae_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pAllocCb));')
iae_body.append(' }')
- iae_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pGpuCount), sizeof(XGL_UINT), pGpuCount);')
+ iae_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pGpuCount), sizeof(uint32_t), pGpuCount);')
iae_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pGpuCount));')
iae_body.append(' if (pGpuCount && pGpus)')
iae_body.append(' {')
@@ -427,7 +427,7 @@
else:
packet_size += '((pDataSize != NULL && pData != NULL) ? *pDataSize : 0) + '
elif '**' in p.ty and 'VOID' in p.ty:
- packet_size += 'sizeof(XGL_VOID*) + '
+ packet_size += 'sizeof(void*) + '
elif 'VOID' in p.ty:
packet_size += 'sizeof(%s) + ' % p.name
elif 'CHAR' in p.ty:
@@ -435,7 +435,7 @@
elif 'DEVICE_CREATE_INFO' in p.ty:
packet_size += 'calc_size_XGL_DEVICE_CREATE_INFO(pCreateInfo) + '
elif 'pDataSize' in p.name:
- packet_size += '((pDataSize != NULL) ? sizeof(XGL_SIZE) : 0) + '
+ packet_size += '((pDataSize != NULL) ? sizeof(size_t) : 0) + '
in_data_size = True;
elif 'IMAGE_SUBRESOURCE' in p.ty and 'pSubresource' == p.name:
packet_size += '((pSubresource != NULL) ? sizeof(XGL_IMAGE_SUBRESOURCE) : 0) + '
@@ -444,7 +444,7 @@
buff_ptr_indices.append(proto.params.index(p))
else:
if 'color' == p.name:
- packet_update_txt += ' memcpy((void*)pPacket->color, color, 4 * sizeof(XGL_UINT32));\n'
+ packet_update_txt += ' memcpy((void*)pPacket->color, color, 4 * sizeof(uint32_t));\n'
else:
packet_update_txt += ' pPacket->%s = %s;\n' % (p.name, p.name)
if 'Count' in p.name and proto.params[-1].name != p.name and p.name not in ['queryCount', 'vertexCount', 'indexCount', 'startCounter'] and proto.name not in ['CmdLoadAtomicCounters', 'CmdSaveAtomicCounters']:
@@ -459,16 +459,16 @@
func_body.append(' %s result;' % proto.ret)
return_txt = 'result = '
if in_data_size:
- func_body.append(' XGL_SIZE dataSizeIn = (pDataSize == NULL) ? 0 : *pDataSize;')
+ func_body.append(' size_t dataSizeIn = (pDataSize == NULL) ? 0 : *pDataSize;')
func_body.append(' struct_xgl%s* pPacket = NULL;' % proto.name)
func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
if 'EnumerateLayers' == proto.name:
func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
- func_body.append(' XGL_SIZE totStringSize = 0;')
+ func_body.append(' size_t totStringSize = 0;')
func_body.append(' uint32_t i = 0;')
func_body.append(' for (i = 0; i < *pOutLayerCount; i++)')
func_body.append(' totStringSize += (pOutLayers[i] != NULL) ? strlen(pOutLayers[i]) + 1: 0;')
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, totStringSize + sizeof(XGL_SIZE));' % (proto.name))
+ func_body.append(' CREATE_TRACE_PACKET(xgl%s, totStringSize + sizeof(size_t));' % (proto.name))
elif proto.name in ['CreateShader', 'CreateFramebuffer', 'CreateRenderPass', 'BeginCommandBuffer', 'CreateGraphicsPipeline', 'CreateComputePipeline']:
func_body.append(' size_t customSize;')
if 'CreateShader' == proto.name:
@@ -503,7 +503,7 @@
if 'MapMemory' == proto.name: # Custom code for MapMem case
func_body.append(' if (ppData != NULL)')
func_body.append(' {')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->ppData), sizeof(XGL_VOID*), *ppData);')
+ func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->ppData), sizeof(void*), *ppData);')
func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->ppData));')
func_body.append(' add_data_to_mem_info(mem, *ppData);')
func_body.append(' }')
@@ -513,7 +513,7 @@
func_body.append(' pPacket->gpu = gpu;')
func_body.append(' pPacket->maxLayerCount = maxLayerCount;')
func_body.append(' pPacket->maxStringSize = maxStringSize;')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pOutLayerCount), sizeof(XGL_SIZE), pOutLayerCount);')
+ func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pOutLayerCount), sizeof(size_t), pOutLayerCount);')
func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pOutLayerCount));')
func_body.append(' for (i = 0; i < *pOutLayerCount; i++) {')
func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pOutLayers[i]), ((pOutLayers[i] != NULL) ? strlen(pOutLayers[i]) + 1 : 0), pOutLayers[i]);')
@@ -535,7 +535,7 @@
elif 'dataSize' == proto.params[idx].name:
func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), dataSize, %s);' % (proto.params[idx].name, proto.params[idx].name))
elif 'pDataSize' == proto.params[idx].name:
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), sizeof(XGL_SIZE), &dataSizeIn);' % (proto.params[idx].name))
+ func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), sizeof(size_t), &dataSizeIn);' % (proto.params[idx].name))
elif 'pData' == proto.params[idx].name:
if 'dataSize' == proto.params[idx-1].name:
func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), dataSize, %s);' % (proto.params[idx].name, proto.params[idx].name))
@@ -563,11 +563,11 @@
func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorStoreOps));')
func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadClearValues));')
elif 'BeginCommandBuffer' == proto.name:
- func_body.append(' add_begin_cmdbuf_to_trace_packet(pHeader, (XGL_VOID**)&pPacket->pBeginInfo->pNext, pBeginInfo->pNext);')
+ func_body.append(' add_begin_cmdbuf_to_trace_packet(pHeader, (void**)&pPacket->pBeginInfo->pNext, pBeginInfo->pNext);')
elif 'CreateGraphicsPipeline' == proto.name:
- func_body.append(' add_pipeline_state_to_trace_packet(pHeader, (XGL_VOID**)&pPacket->pCreateInfo->pNext, pCreateInfo->pNext);')
+ func_body.append(' add_pipeline_state_to_trace_packet(pHeader, (void**)&pPacket->pCreateInfo->pNext, pCreateInfo->pNext);')
else:
- func_body.append(' add_pipeline_state_to_trace_packet(pHeader, (XGL_VOID**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext);')
+ func_body.append(' add_pipeline_state_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext);')
func_body.append(' add_pipeline_shader_to_trace_packet(pHeader, (XGL_PIPELINE_SHADER*)&pPacket->pCreateInfo->cs, &pCreateInfo->cs);')
func_body.append(' finalize_pipeline_shader_address(pHeader, &pPacket->pCreateInfo->cs);')
if 'VOID' not in proto.ret or '*' in proto.ret:
@@ -654,7 +654,7 @@
hf_body.append('typedef struct _XGLAllocInfo {')
hf_body.append(' XGL_GPU_SIZE size;')
hf_body.append(' XGL_GPU_MEMORY handle;')
- hf_body.append(' XGL_VOID *pData;')
+ hf_body.append(' void *pData;')
hf_body.append(' BOOL valid;')
hf_body.append('} XGLAllocInfo;')
hf_body.append('typedef struct _XGLMemInfo {')
@@ -747,7 +747,7 @@
hf_body.append(' return NULL;')
hf_body.append('}')
hf_body.append('')
- hf_body.append('static void add_new_handle_to_mem_info(const XGL_GPU_MEMORY handle, XGL_GPU_SIZE size, XGL_VOID *pData)')
+ hf_body.append('static void add_new_handle_to_mem_info(const XGL_GPU_MEMORY handle, XGL_GPU_SIZE size, void *pData)')
hf_body.append('{')
hf_body.append(' XGLAllocInfo *entry;')
hf_body.append('')
@@ -765,7 +765,7 @@
hf_body.append(' }')
hf_body.append('}')
hf_body.append('')
- hf_body.append('static void add_data_to_mem_info(const XGL_GPU_MEMORY handle, XGL_VOID *pData)')
+ hf_body.append('static void add_data_to_mem_info(const XGL_GPU_MEMORY handle, void *pData)')
hf_body.append('{')
hf_body.append(' XGLAllocInfo *entry = find_mem_info_entry(handle);')
hf_body.append('')
@@ -797,7 +797,7 @@
hf_body.append('')
- hf_body.append('static void add_begin_cmdbuf_to_trace_packet(glv_trace_packet_header* pHeader, XGL_VOID** ppOut, const XGL_VOID* pIn)')
+ hf_body.append('static void add_begin_cmdbuf_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
hf_body.append('{')
hf_body.append(' const XGL_CMD_BUFFER_BEGIN_INFO* pInNow = pIn;')
hf_body.append(' XGL_CMD_BUFFER_BEGIN_INFO** ppOutNext = (XGL_CMD_BUFFER_BEGIN_INFO**)ppOut;')
@@ -847,7 +847,7 @@
hf_body.append('static size_t calculate_pipeline_shader_size(const XGL_PIPELINE_SHADER* shader)')
hf_body.append('{')
hf_body.append(' size_t size = 0;')
- hf_body.append(' XGL_UINT i, j;')
+ hf_body.append(' uint32_t i, j;')
hf_body.append(' ')
hf_body.append(' size += sizeof(XGL_PIPELINE_SHADER);')
hf_body.append(' // descriptor sets')
@@ -866,7 +866,7 @@
hf_body.append(' // constant buffers')
hf_body.append(' if (shader->linkConstBufferCount > 0 && shader->pLinkConstBufferInfo != NULL)')
hf_body.append(' {')
- hf_body.append(' XGL_UINT i;')
+ hf_body.append(' uint32_t i;')
hf_body.append(' for (i = 0; i < shader->linkConstBufferCount; i++)')
hf_body.append(' {')
hf_body.append(' size += sizeof(XGL_LINK_CONST_BUFFER);')
@@ -878,7 +878,7 @@
hf_body.append('')
hf_body.append('static void add_pipeline_shader_to_trace_packet(glv_trace_packet_header* pHeader, XGL_PIPELINE_SHADER* packetShader, const XGL_PIPELINE_SHADER* paramShader)')
hf_body.append('{')
- hf_body.append(' XGL_UINT i, j;')
+ hf_body.append(' uint32_t i, j;')
hf_body.append(' // descriptor sets')
hf_body.append(' for (i = 0; i < XGL_MAX_DESCRIPTOR_SETS; i++)')
hf_body.append(' {')
@@ -906,7 +906,7 @@
hf_body.append('')
hf_body.append('static void finalize_pipeline_shader_address(glv_trace_packet_header* pHeader, const XGL_PIPELINE_SHADER* packetShader)')
hf_body.append('{')
- hf_body.append(' XGL_UINT i, j;')
+ hf_body.append(' uint32_t i, j;')
hf_body.append(' // descriptor sets')
hf_body.append(' for (i = 0; i < XGL_MAX_DESCRIPTOR_SETS; i++)')
hf_body.append(' {')
@@ -931,7 +931,7 @@
hf_body.append(' }')
hf_body.append('}')
hf_body.append('')
- hf_body.append('static size_t calculate_pipeline_state_size(const XGL_VOID* pState)')
+ hf_body.append('static size_t calculate_pipeline_state_size(const void* pState)')
hf_body.append('{')
hf_body.append(' const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pNext = pState;')
hf_body.append(' size_t totalStateSize = 0;')
@@ -975,7 +975,7 @@
hf_body.append(' return totalStateSize;')
hf_body.append('}')
hf_body.append('')
- hf_body.append('static void add_pipeline_state_to_trace_packet(glv_trace_packet_header* pHeader, XGL_VOID** ppOut, const XGL_VOID* pIn)')
+ hf_body.append('static void add_pipeline_state_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
hf_body.append('{')
hf_body.append(' const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pInNow = pIn;')
hf_body.append(' XGL_GRAPHICS_PIPELINE_CREATE_INFO** ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)ppOut;')
@@ -1161,7 +1161,7 @@
pid_enum.append('//=============================================================================\n')
pid_enum.append('static uint64_t calc_size_XGL_DEVICE_CREATE_INFO(const XGL_DEVICE_CREATE_INFO* pStruct)')
pid_enum.append('{')
- pid_enum.append(' uint64_t total_size_ppEnabledExtensionNames = pStruct->extensionCount * sizeof(XGL_CHAR *);')
+ pid_enum.append(' uint64_t total_size_ppEnabledExtensionNames = pStruct->extensionCount * sizeof(char *);')
pid_enum.append(' uint32_t i;')
pid_enum.append(' for (i = 0; i < pStruct->extensionCount; i++)')
pid_enum.append(' {')
@@ -1191,7 +1191,7 @@
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&(*ppStruct)->pRequestedQueues);')
pid_enum.append(' if (pInStruct->extensionCount > 0) ')
pid_enum.append(' {')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppStruct)->ppEnabledExtensionNames), pInStruct->extensionCount * sizeof(XGL_CHAR *), pInStruct->ppEnabledExtensionNames);')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppStruct)->ppEnabledExtensionNames), pInStruct->extensionCount * sizeof(char *), pInStruct->ppEnabledExtensionNames);')
pid_enum.append(' for (i = 0; i < pInStruct->extensionCount; i++)')
pid_enum.append(' {')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppStruct)->ppEnabledExtensionNames[i])), strlen(pInStruct->ppEnabledExtensionNames[i]) + 1, pInStruct->ppEnabledExtensionNames[i]);')
@@ -1207,7 +1207,7 @@
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppStruct)->pNext)), sizeof(XGL_LAYER_CREATE_INFO), pNext);')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)(&((*ppStruct)->pNext)));')
pid_enum.append(' XGL_LAYER_CREATE_INFO **ppOutStruct = (XGL_LAYER_CREATE_INFO **) &((*ppStruct)->pNext);')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppOutStruct)->ppActiveLayerNames), pNext->layerCount * sizeof(XGL_CHAR *), pNext->ppActiveLayerNames);')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppOutStruct)->ppActiveLayerNames), pNext->layerCount * sizeof(char *), pNext->ppActiveLayerNames);')
pid_enum.append(' for (i = 0; i < pNext->layerCount; i++)')
pid_enum.append(' {')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppOutStruct)->ppActiveLayerNames[i])), strlen(pNext->ppActiveLayerNames[i]) + 1, pNext->ppActiveLayerNames[i]);')
@@ -1225,15 +1225,15 @@
pid_enum.append(' if (pXGL_DEVICE_CREATE_INFO != NULL)')
pid_enum.append(' {')
pid_enum.append(' uint32_t i;')
- pid_enum.append(' const XGL_CHAR** pNames;')
+ pid_enum.append(' const char** pNames;')
pid_enum.append(' pXGL_DEVICE_CREATE_INFO->pRequestedQueues = (const XGL_DEVICE_QUEUE_CREATE_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->pRequestedQueues);\n')
pid_enum.append(' if (pXGL_DEVICE_CREATE_INFO->extensionCount > 0)')
pid_enum.append(' {')
- pid_enum.append(' pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames = (const XGL_CHAR *const*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames);')
- pid_enum.append(' pNames = (const XGL_CHAR**)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames;')
+ pid_enum.append(' pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames = (const char *const*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames);')
+ pid_enum.append(' pNames = (const char**)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames;')
pid_enum.append(' for (i = 0; i < pXGL_DEVICE_CREATE_INFO->extensionCount; i++)')
pid_enum.append(' {')
- pid_enum.append(' pNames[i] = (const XGL_CHAR*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames[i]));')
+ pid_enum.append(' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames[i]));')
pid_enum.append(' }')
pid_enum.append(' }')
pid_enum.append(' XGL_LAYER_CREATE_INFO *pNext = ( XGL_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->pNext);')
@@ -1241,11 +1241,11 @@
pid_enum.append(' {')
pid_enum.append(' if ((pNext->sType == XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO) && pNext->layerCount > 0)')
pid_enum.append(' {')
- pid_enum.append(' pNext->ppActiveLayerNames = (const XGL_CHAR**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames));')
- pid_enum.append(' pNames = (const XGL_CHAR**)pNext->ppActiveLayerNames;')
+ pid_enum.append(' pNext->ppActiveLayerNames = (const char**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames));')
+ pid_enum.append(' pNames = (const char**)pNext->ppActiveLayerNames;')
pid_enum.append(' for (i = 0; i < pNext->layerCount; i++)')
pid_enum.append(' {')
- pid_enum.append(' pNames[i] = (const XGL_CHAR*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames[i]));')
+ pid_enum.append(' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames[i]));')
pid_enum.append(' }')
pid_enum.append(' }')
pid_enum.append(' pNext = ( XGL_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);')
@@ -1255,7 +1255,7 @@
pid_enum.append('}\n')
pid_enum.append('static void interpret_pipeline_shader(glv_trace_packet_header* pHeader, XGL_PIPELINE_SHADER* pShader)')
pid_enum.append('{')
- pid_enum.append(' XGL_UINT i, j;')
+ pid_enum.append(' uint32_t i, j;')
pid_enum.append(' if (pShader != NULL)')
pid_enum.append(' {')
pid_enum.append(' // descriptor sets')
@@ -1275,12 +1275,12 @@
pid_enum.append(' // constant buffers')
pid_enum.append(' if (pShader->linkConstBufferCount > 0)')
pid_enum.append(' {')
- pid_enum.append(' XGL_UINT i;')
+ pid_enum.append(' uint32_t i;')
pid_enum.append(' pShader->pLinkConstBufferInfo = (const XGL_LINK_CONST_BUFFER*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo);')
pid_enum.append(' for (i = 0; i < pShader->linkConstBufferCount; i++)')
pid_enum.append(' {')
pid_enum.append(' XGL_LINK_CONST_BUFFER* pBuffer = (XGL_LINK_CONST_BUFFER*)pShader->pLinkConstBufferInfo;')
- pid_enum.append(' pBuffer[i].pBufferData = (const XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo[i].pBufferData);')
+ pid_enum.append(' pBuffer[i].pBufferData = (const void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo[i].pBufferData);')
pid_enum.append(' }')
pid_enum.append(' }')
pid_enum.append(' }')
@@ -1291,8 +1291,8 @@
def _generate_interp_funcs(self):
# Custom txt for given function and parameter. First check if param is NULL, then insert txt if not
custom_case_dict = { 'InitAndEnumerateGpus' : {'param': 'pAppInfo', 'txt': ['XGL_APPLICATION_INFO* pInfo = (XGL_APPLICATION_INFO*)pPacket->pAppInfo;\n',
- 'pInfo->pAppName = (const XGL_CHAR*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pAppName);\n',
- 'pInfo->pEngineName = (const XGL_CHAR*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pEngineName);']},
+ 'pInfo->pAppName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pAppName);\n',
+ 'pInfo->pEngineName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pEngineName);']},
'CreateShader' : {'param': 'pCreateInfo', 'txt': ['XGL_SHADER_CREATE_INFO* pInfo = (XGL_SHADER_CREATE_INFO*)pPacket->pCreateInfo;\n',
'pInfo->pCode = glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pCode);']},
'CreateFramebuffer' : {'param': 'pCreateInfo', 'txt': ['XGL_FRAMEBUFFER_CREATE_INFO* pInfo = (XGL_FRAMEBUFFER_CREATE_INFO*)pPacket->pCreateInfo;\n',
@@ -1304,15 +1304,15 @@
'pInfo->pColorLoadClearValues = (XGL_CLEAR_COLOR*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLoadClearValues);\n']},
'BeginCommandBuffer' : {'param': 'pBeginInfo', 'txt': ['assert(pPacket->pBeginInfo->sType == XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO);\n',
'// need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
- 'XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pPacket->pBeginInfo->pNext;\n',
- '*ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n',
+ 'void** ppNextVoidPtr = (void**)&pPacket->pBeginInfo->pNext;\n',
+ '*ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n',
'XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO* pNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)pPacket->pBeginInfo->pNext;\n',
'while ((NULL != pNext) && (XGL_NULL_HANDLE != pNext))\n', '{\n',
' switch(pNext->sType)\n', ' {\n',
' case XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO:\n',
' {\n',
- ' XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pNext->pNext;\n',
- ' *ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
' default:\n',
@@ -1322,8 +1322,8 @@
'}']},
'CreateGraphicsPipeline' : {'param': 'pCreateInfo', 'txt': ['assert(pPacket->pCreateInfo->sType == XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO);\n',
'// need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
- 'XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pPacket->pCreateInfo->pNext;\n',
- '*ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pNext);\n',
+ 'void** ppNextVoidPtr = (void**)&pPacket->pCreateInfo->pNext;\n',
+ '*ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pNext);\n',
'XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;\n',
'while ((NULL != pNext) && (XGL_NULL_HANDLE != pNext))\n', '{\n',
' switch(pNext->sType)\n', ' {\n',
@@ -1333,22 +1333,22 @@
' case XGL_STRUCTURE_TYPE_PIPELINE_DB_STATE_CREATE_INFO:\n',
' case XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO:\n',
' {\n',
- ' XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pNext->pNext;\n',
- ' *ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
' case XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:\n',
' {\n',
- ' XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pNext->pNext;\n',
- ' *ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' interpret_pipeline_shader(pHeader, &pNext->shader);\n',
' break;\n',
' }\n',
' case XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:\n',
' {\n',
- ' XGL_VOID** ppNextVoidPtr = (XGL_VOID**)&pNext->pNext;\n',
+ ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
' XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pVi = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *) pNext;\n',
- ' *ppNextVoidPtr = (XGL_VOID*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' pVi->pVertexBindingDescriptions = (XGL_VERTEX_INPUT_BINDING_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexBindingDescriptions);\n',
' pVi->pVertexAttributeDescriptions = (XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexAttributeDescriptions);\n',
' break;\n',
@@ -1375,7 +1375,7 @@
for proto in self.protos:
if 'Wsi' not in proto.name and 'Dbg' not in proto.name:
if 'UnmapMemory' == proto.name:
- proto.params.append(xgl.Param("XGL_VOID*", "pData"))
+ proto.params.append(xgl.Param("void*", "pData"))
if_body.append('typedef struct struct_xgl%s {' % proto.name)
if_body.append(' glv_trace_packet_header* header;')
for p in proto.params:
@@ -1383,7 +1383,7 @@
if_body.append(' %s %s[4];' % (p.ty.strip('[4]'), p.name))
else:
if_body.append(' %s %s;' % (p.ty, p.name))
- if 'XGL_VOID' != proto.ret:
+ if 'void' != proto.ret:
if_body.append(' %s result;' % proto.ret)
if_body.append('} struct_xgl%s;\n' % proto.name)
if_body.append('static struct_xgl%s* interpret_body_as_xgl%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
@@ -1413,7 +1413,7 @@
if_body.append(' glv_trace_packet_header* pHeader;')
for p in proto.params:
if_body.append(' %s %s;' % (p.ty, p.name))
- if 'XGL_VOID' != proto.ret:
+ if 'void' != proto.ret:
if_body.append(' %s result;' % proto.ret)
if_body.append('} struct_xgl%s;\n' % proto.name)
if_body.append('static struct_xgl%s* interpret_body_as_xgl%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
@@ -1434,7 +1434,7 @@
cd_body.append(' virtual ~ApiReplay() { }')
cd_body.append(' virtual enum glv_replay::GLV_REPLAY_RESULT replay(glv_trace_packet_header * packet) = 0;')
cd_body.append(' virtual int init(glv_replay::Display & disp) = 0;')
- cd_body.append(' virtual void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, XGL_SIZE location, XGL_INT msgCode, const char* pMsg) = 0;')
+ cd_body.append(' virtual void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char* pMsg) = 0;')
cd_body.append(' virtual glv_replay::GLV_REPLAY_RESULT pop_validation_msgs() = 0;')
cd_body.append('};\n')
cd_body.append('class xglDisplay: public glv_replay::DisplayImp {')
@@ -1467,16 +1467,16 @@
cd_body.append(' unsigned int m_windowHeight;')
cd_body.append('#if 0')
cd_body.append(' XGL_DEVICE m_dev[XGL_MAX_PHYSICAL_GPUS];')
- cd_body.append(' XGL_UINT32 m_gpuCount;')
+ cd_body.append(' uint32_t m_gpuCount;')
cd_body.append(' unsigned int m_gpuIdx;')
cd_body.append(' XGL_PHYSICAL_GPU m_gpus[XGL_MAX_PHYSICAL_GPUS];')
cd_body.append(' XGL_PHYSICAL_GPU_PROPERTIES m_gpuProps[XGL_MAX_PHYSICAL_GPUS];')
cd_body.append('#endif')
- cd_body.append(' std::vector<XGL_CHAR *>m_extensions;')
+ cd_body.append(' std::vector<char *>m_extensions;')
cd_body.append('};\n')
cd_body.append('typedef struct _XGLAllocInfo {')
cd_body.append(' XGL_GPU_SIZE size;')
- cd_body.append(' XGL_VOID *pData;')
+ cd_body.append(' void *pData;')
cd_body.append('} XGLAllocInfo;')
return "\n".join(cd_body)
@@ -1554,7 +1554,7 @@
rc_body.append(' xglDisplay * get_display() {return m_display;}')
rc_body.append(' glv_replay::GLV_REPLAY_RESULT replay(glv_trace_packet_header *packet);')
rc_body.append(' glv_replay::GLV_REPLAY_RESULT handle_replay_errors(const char* entrypointName, const XGL_RESULT resCall, const XGL_RESULT resTrace, const glv_replay::GLV_REPLAY_RESULT resIn);\n')
- rc_body.append(' void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, XGL_SIZE location, XGL_INT msgCode, const char* pMsg);')
+ rc_body.append(' void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char* pMsg);')
rc_body.append(' glv_replay::GLV_REPLAY_RESULT pop_validation_msgs();')
rc_body.append('private:')
rc_body.append(' struct xglFuncs m_xglFuncs;')
@@ -1567,8 +1567,8 @@
rc_body.append(' struct validationMsg {')
rc_body.append(' XGL_VALIDATION_LEVEL validationLevel;')
rc_body.append(' XGL_BASE_OBJECT srcObject;')
- rc_body.append(' XGL_SIZE location;')
- rc_body.append(' XGL_INT msgCode;')
+ rc_body.append(' size_t location;')
+ rc_body.append(' int32_t msgCode;')
rc_body.append(' char msg[256];')
rc_body.append(' };')
rc_body.append(' std::vector<struct validationMsg> m_validationMsgs;')
@@ -1581,7 +1581,7 @@
rc_body.append(' info.size = size;')
rc_body.append(' m_mapData.insert(std::pair<XGL_GPU_MEMORY, XGLAllocInfo>(handle, info));')
rc_body.append(' }')
- rc_body.append(' void add_mapping_to_mapData(XGL_GPU_MEMORY handle, XGL_VOID *pData)')
+ rc_body.append(' void add_mapping_to_mapData(XGL_GPU_MEMORY handle, void *pData)')
rc_body.append(' {')
rc_body.append(' std::map<XGL_GPU_MEMORY,XGLAllocInfo>::iterator it = m_mapData.find(handle);')
rc_body.append(' if (it == m_mapData.end())')
@@ -1603,7 +1603,7 @@
rc_body.append(' return;')
rc_body.append(' m_mapData.erase(it);')
rc_body.append(' }')
- rc_body.append(' void rm_mapping_from_mapData(XGL_GPU_MEMORY handle, XGL_VOID* pData)')
+ rc_body.append(' void rm_mapping_from_mapData(XGL_GPU_MEMORY handle, void* pData)')
rc_body.append(' {')
rc_body.append(' std::map<XGL_GPU_MEMORY,XGLAllocInfo>::iterator it = m_mapData.find(handle);')
rc_body.append(' if (it == m_mapData.end())')
@@ -1707,9 +1707,9 @@
dix_body.append(' XGL_RESULT res = xglInitAndEnumerateGpus(&appInfo, NULL, XGL_MAX_PHYSICAL_GPUS, &m_gpuCount, m_gpus);')
dix_body.append(' if ( res == XGL_SUCCESS ) {')
dix_body.append(' // retrieve the GPU information for all GPUs')
- dix_body.append(' for( XGL_UINT32 gpu = 0; gpu < m_gpuCount; gpu++)')
+ dix_body.append(' for( uint32_t gpu = 0; gpu < m_gpuCount; gpu++)')
dix_body.append(' {')
- dix_body.append(' XGL_SIZE gpuInfoSize = sizeof(m_gpuProps[0]);\n')
+ dix_body.append(' size_t gpuInfoSize = sizeof(m_gpuProps[0]);\n')
dix_body.append(' // get the GPU physical properties:')
dix_body.append(' res = xglGetGpuInfo( m_gpus[gpu], XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES, &gpuInfoSize, &m_gpuProps[gpu]);')
dix_body.append(' if (res != XGL_SUCCESS)')
@@ -1731,7 +1731,7 @@
dix_body.append(' {')
dix_body.append(' res = xglGetExtensionSupport( m_gpus[gpu_idx], extensions[ext] );')
dix_body.append(' if (res == XGL_SUCCESS) {')
- dix_body.append(' m_extensions.push_back((XGL_CHAR *) extensions[ext]);')
+ dix_body.append(' m_extensions.push_back((char *) extensions[ext]);')
dix_body.append(' if (!strcmp(extensions[ext], "XGL_WSI_WINDOWS"))')
dix_body.append(' foundWSIExt = true;')
dix_body.append(' }')
@@ -1745,15 +1745,15 @@
dix_body.append(' dqci.queueCount = 1;')
dix_body.append(' dqci.queueType = XGL_QUEUE_UNIVERSAL;')
dix_body.append(' // create the device enabling validation level 4')
- dix_body.append(' const XGL_CHAR * const * extNames = &m_extensions[0];')
+ dix_body.append(' const char * const * extNames = &m_extensions[0];')
dix_body.append(' XGL_DEVICE_CREATE_INFO info = {};')
dix_body.append(' info.queueRecordCount = 1;')
dix_body.append(' info.pRequestedQueues = &dqci;')
- dix_body.append(' info.extensionCount = static_cast <XGL_UINT> (m_extensions.size());')
+ dix_body.append(' info.extensionCount = static_cast <uint32_t> (m_extensions.size());')
dix_body.append(' info.ppEnabledExtensionNames = extNames;')
dix_body.append(' info.flags = XGL_DEVICE_CREATE_VALIDATION;')
dix_body.append(' info.maxValidationLevel = XGL_VALIDATION_LEVEL_4;')
- dix_body.append(' XGL_BOOL xglTrue = XGL_TRUE;')
+ dix_body.append(' bool32_t xglTrue = XGL_TRUE;')
dix_body.append(' res = xglDbgSetGlobalOption( XGL_DBG_OPTION_BREAK_ON_ERROR, sizeof( xglTrue ), &xglTrue );')
dix_body.append(' if (res != XGL_SUCCESS)')
dix_body.append(' glv_LogWarn("Could not set debug option break on error\\n");')
@@ -2026,7 +2026,7 @@
def _generate_replay_validation_funcs(self):
rvf_body = []
- rvf_body.append('void xglReplay::push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, XGL_SIZE location, XGL_INT msgCode, const char * pMsg)')
+ rvf_body.append('void xglReplay::push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char * pMsg)')
rvf_body.append('{')
rvf_body.append(' struct validationMsg msgObj;')
rvf_body.append(' msgObj.validationLevel = validationLevel;')
@@ -2093,9 +2093,9 @@
ieg_body = []
ieg_body.append(' if (!m_display->m_initedXGL)')
ieg_body.append(' {')
- ieg_body.append(' XGL_UINT gpuCount;')
+ ieg_body.append(' uint32_t gpuCount;')
ieg_body.append(' XGL_PHYSICAL_GPU gpus[XGL_MAX_PHYSICAL_GPUS];')
- ieg_body.append(' XGL_UINT maxGpus = (pPacket->maxGpus < XGL_MAX_PHYSICAL_GPUS) ? pPacket->maxGpus : XGL_MAX_PHYSICAL_GPUS;')
+ ieg_body.append(' uint32_t maxGpus = (pPacket->maxGpus < XGL_MAX_PHYSICAL_GPUS) ? pPacket->maxGpus : XGL_MAX_PHYSICAL_GPUS;')
ieg_body.append(' replayResult = m_xglFuncs.real_xglInitAndEnumerateGpus(pPacket->pAppInfo, pPacket->pAllocCb, maxGpus, &gpuCount, &gpus[0]);')
ieg_body.append(' CHECK_RETURN_VALUE(xglInitAndEnumerateGpus);')
ieg_body.append(' //TODO handle different number of gpus in trace versus replay')
@@ -2113,7 +2113,7 @@
ieg_body.append(' }')
ieg_body.append(' clear_all_map_handles();')
ieg_body.append(' // TODO handle enumeration results in a different order from trace to replay')
- ieg_body.append(' for (XGL_UINT i = 0; i < gpuCount; i++)')
+ ieg_body.append(' for (uint32_t i = 0; i < gpuCount; i++)')
ieg_body.append(' {')
ieg_body.append(' if (pPacket->pGpus)')
ieg_body.append(' add_to_map(&(pPacket->pGpus[i]), &(gpus[i]));')
@@ -2129,7 +2129,7 @@
ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES:')
ggi_body.append(' {')
ggi_body.append(' XGL_PHYSICAL_GPU_PROPERTIES gpuProps;')
- ggi_body.append(' XGL_SIZE dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);')
+ ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);')
ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &dataSize,')
ggi_body.append(' (pPacket->pData == NULL) ? NULL : &gpuProps);')
ggi_body.append(' if (pPacket->pData != NULL)')
@@ -2143,7 +2143,7 @@
ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_PERFORMANCE:')
ggi_body.append(' {')
ggi_body.append(' XGL_PHYSICAL_GPU_PERFORMANCE gpuPerfs;')
- ggi_body.append(' XGL_SIZE dataSize = sizeof(XGL_PHYSICAL_GPU_PERFORMANCE);')
+ ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_PERFORMANCE);')
ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &dataSize,')
ggi_body.append(' (pPacket->pData == NULL) ? NULL : &gpuPerfs);')
ggi_body.append(' if (pPacket->pData != NULL)')
@@ -2157,8 +2157,8 @@
ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_QUEUE_PROPERTIES:')
ggi_body.append(' {')
ggi_body.append(' XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *pGpuQueue, *pQ;')
- ggi_body.append(' XGL_SIZE dataSize = sizeof(XGL_PHYSICAL_GPU_QUEUE_PROPERTIES);')
- ggi_body.append(' XGL_SIZE numQueues = 1;')
+ ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_QUEUE_PROPERTIES);')
+ ggi_body.append(' size_t numQueues = 1;')
ggi_body.append(' assert(pPacket->pDataSize);')
ggi_body.append(' if ((*(pPacket->pDataSize) % dataSize) != 0)')
ggi_body.append(' glv_LogWarn("xglGetGpuInfo() for GPU_QUEUE_PROPERTIES not an integral data size assuming 1\\n");')
@@ -2183,7 +2183,7 @@
ggi_body.append(' }')
ggi_body.append(' default:')
ggi_body.append(' {')
- ggi_body.append(' XGL_SIZE size = 0;')
+ ggi_body.append(' size_t size = 0;')
ggi_body.append(' void* pData = NULL;')
ggi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
ggi_body.append(' {')
@@ -2219,10 +2219,10 @@
cd_body.append(' {')
cd_body.append(' XGL_DEVICE_CREATE_INFO cInfo, *ci, *pCreateInfoSaved;')
cd_body.append(' // TODO what is the real list of layers to be running with??')
-# cd_body.append(' const XGL_CHAR * layersStr[2] = {(XGL_CHAR *) "DrawState", (XGL_CHAR *) "ObjectTracker"};')
+# cd_body.append(' const char * layersStr[2] = {(char *) "DrawState", (char *) "ObjectTracker"};')
cd_body.append(' unsigned int numLayers = 0;')
- cd_body.append(' XGL_CHAR ** layersStr = get_enableLayers_list(&numLayers);')
+ cd_body.append(' char ** layersStr = get_enableLayers_list(&numLayers);')
cd_body.append(' XGL_LAYER_CREATE_INFO layerInfo;')
cd_body.append(' pCreateInfoSaved = (XGL_DEVICE_CREATE_INFO *) pPacket->pCreateInfo;')
cd_body.append(' ci = (XGL_DEVICE_CREATE_INFO *) pPacket->pCreateInfo;')
@@ -2276,7 +2276,7 @@
ges_body.append(' break;')
ges_body.append(' }')
ges_body.append(' if (!extInList)')
- ges_body.append(' m_display->m_extensions.push_back((XGL_CHAR *) g_extensions[ext]);')
+ ges_body.append(' m_display->m_extensions.push_back((char *) g_extensions[ext]);')
ges_body.append(' break;')
ges_body.append(' }')
ges_body.append(' }')
@@ -2290,7 +2290,7 @@
qs_body.append(' if (pPacket->pCmdBuffers != NULL)')
qs_body.append(' {')
qs_body.append(' remappedBuffers = GLV_NEW_ARRAY( XGL_CMD_BUFFER, pPacket->cmdBufferCount);')
- qs_body.append(' for (XGL_UINT i = 0; i < pPacket->cmdBufferCount; i++)')
+ qs_body.append(' for (uint32_t i = 0; i < pPacket->cmdBufferCount; i++)')
qs_body.append(' {')
qs_body.append(' *(remappedBuffers + i) = remap(*(pPacket->pCmdBuffers + i));')
qs_body.append(' }')
@@ -2300,7 +2300,7 @@
qs_body.append(' {')
qs_body.append(' memRefs = GLV_NEW_ARRAY(XGL_MEMORY_REF, pPacket->memRefCount);')
qs_body.append(' memcpy(memRefs, pPacket->pMemRefs, sizeof(XGL_MEMORY_REF) * pPacket->memRefCount);')
- qs_body.append(' for (XGL_UINT i = 0; i < pPacket->memRefCount; i++)')
+ qs_body.append(' for (uint32_t i = 0; i < pPacket->memRefCount; i++)')
qs_body.append(' {')
qs_body.append(' memRefs[i].mem = remap(pPacket->pMemRefs[i].mem);')
qs_body.append(' }')
@@ -2314,17 +2314,17 @@
def _gen_replay_remap_virtual_memory_pages(self):
rvm_body = []
rvm_body.append(' XGL_VIRTUAL_MEMORY_REMAP_RANGE *pRemappedRanges = GLV_NEW_ARRAY( XGL_VIRTUAL_MEMORY_REMAP_RANGE, pPacket->rangeCount);')
- rvm_body.append(' for (XGL_UINT i = 0; i < pPacket->rangeCount; i++)')
+ rvm_body.append(' for (uint32_t i = 0; i < pPacket->rangeCount; i++)')
rvm_body.append(' {')
rvm_body.append(' copy_mem_remap_range_struct(pRemappedRanges + i, (pPacket->pRanges + i));')
rvm_body.append(' }')
rvm_body.append(' XGL_QUEUE_SEMAPHORE *pRemappedPreSema = GLV_NEW_ARRAY(XGL_QUEUE_SEMAPHORE, pPacket->preWaitSemaphoreCount);')
- rvm_body.append(' for (XGL_UINT i = 0; i < pPacket->preWaitSemaphoreCount; i++)')
+ rvm_body.append(' for (uint32_t i = 0; i < pPacket->preWaitSemaphoreCount; i++)')
rvm_body.append(' {')
rvm_body.append(' *(pRemappedPreSema + i) = *(pPacket->pPreWaitSemaphores + i);')
rvm_body.append(' }')
rvm_body.append(' XGL_QUEUE_SEMAPHORE *pRemappedPostSema = GLV_NEW_ARRAY(XGL_QUEUE_SEMAPHORE, pPacket->postSignalSemaphoreCount);')
- rvm_body.append(' for (XGL_UINT i = 0; i < pPacket->postSignalSemaphoreCount; i++)')
+ rvm_body.append(' for (uint32_t i = 0; i < pPacket->postSignalSemaphoreCount; i++)')
rvm_body.append(' {')
rvm_body.append(' *(pRemappedPostSema + i) = *(pPacket->pPostSignalSemaphores + i);')
rvm_body.append(' }')
@@ -2337,7 +2337,7 @@
def _gen_replay_get_object_info(self):
goi_body = []
- goi_body.append(' XGL_SIZE size = 0;')
+ goi_body.append(' size_t size = 0;')
goi_body.append(' void* pData = NULL;')
goi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
goi_body.append(' {')
@@ -2362,7 +2362,7 @@
def _gen_replay_get_format_info(self):
gfi_body = []
- gfi_body.append(' XGL_SIZE size = 0;')
+ gfi_body.append(' size_t size = 0;')
gfi_body.append(' void* pData = NULL;')
gfi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
gfi_body.append(' {')
@@ -2386,7 +2386,7 @@
def _gen_replay_get_image_subresource_info(self):
isi_body = []
- isi_body.append(' XGL_SIZE size = 0;')
+ isi_body.append(' size_t size = 0;')
isi_body.append(' void* pData = NULL;')
isi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
isi_body.append(' {')
@@ -2448,7 +2448,7 @@
cf_body.append(' allocatedColorAttachments = true;')
cf_body.append(' pColorAttachments = GLV_NEW_ARRAY(XGL_COLOR_ATTACHMENT_BIND_INFO, pInfo->colorAttachmentCount);')
cf_body.append(' memcpy(pColorAttachments, pSavedColor, sizeof(XGL_COLOR_ATTACHMENT_BIND_INFO) * pInfo->colorAttachmentCount);')
- cf_body.append(' for (XGL_UINT i = 0; i < pInfo->colorAttachmentCount; i++)')
+ cf_body.append(' for (uint32_t i = 0; i < pInfo->colorAttachmentCount; i++)')
cf_body.append(' {')
cf_body.append(' pColorAttachments[i].view = remap(pInfo->pColorAttachments[i].view);')
cf_body.append(' }')
@@ -2522,7 +2522,7 @@
def _gen_replay_store_pipeline(self):
sp_body = []
- sp_body.append(' XGL_SIZE size = 0;')
+ sp_body.append(' size_t size = 0;')
sp_body.append(' void* pData = NULL;')
sp_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
sp_body.append(' {')
@@ -2565,7 +2565,7 @@
def _gen_replay_wait_for_fences(self):
wf_body = []
wf_body.append(' XGL_FENCE *pFence = GLV_NEW_ARRAY(XGL_FENCE, pPacket->fenceCount);')
- wf_body.append(' for (XGL_UINT i = 0; i < pPacket->fenceCount; i++)')
+ wf_body.append(' for (uint32_t i = 0; i < pPacket->fenceCount; i++)')
wf_body.append(' {')
wf_body.append(' *(pFence + i) = remap(*(pPacket->pFences + i));')
wf_body.append(' }')
@@ -2624,7 +2624,7 @@
def _gen_replay_map_memory(self):
mm_body = []
mm_body.append(' XGL_GPU_MEMORY handle = remap(pPacket->mem);')
- mm_body.append(' XGL_VOID* pData;')
+ mm_body.append(' void* pData;')
mm_body.append(' replayResult = m_xglFuncs.real_xglMapMemory(handle, pPacket->flags, &pData);')
mm_body.append(' if (replayResult == XGL_SUCCESS)')
mm_body.append(' add_mapping_to_mapData(handle, pData);')
@@ -2741,7 +2741,7 @@
rbody.append(' allocatedMem = true;')
rbody.append(' pStateTransitions = GLV_NEW_ARRAY(%s, pPacket->transitionCount);' % (proto.params[-1].ty.strip('*').strip('const ')))
rbody.append(' memcpy(pStateTransitions, pPacket->pStateTransitions, sizeof(%s) * pPacket->transitionCount);' % (proto.params[-1].ty.strip('*').strip('const ')))
- rbody.append(' for (XGL_UINT i = 0; i < pPacket->transitionCount; i++)')
+ rbody.append(' for (uint32_t i = 0; i < pPacket->transitionCount; i++)')
rbody.append(' {')
if 'Memory' in proto.name:
rbody.append(' pStateTransitions[i].mem = remap(pPacket->pStateTransitions[i].mem);')
@@ -2752,7 +2752,7 @@
elif ds_attach:
rbody.append(' %s %s = GLV_NEW_ARRAY(%s, pPacket->slotCount);' % (proto.params[-1].ty.strip('const '), proto.params[-1].name, proto.params[-1].ty.strip('const ').strip('*')))
rbody.append(' memcpy(%s, pPacket->%s, pPacket->slotCount * sizeof(%s));' % (proto.params[-1].name, proto.params[-1].name, proto.params[-1].ty.strip('const ').strip('*')))
- rbody.append(' for (XGL_UINT i = 0; i < pPacket->slotCount; i++)')
+ rbody.append(' for (uint32_t i = 0; i < pPacket->slotCount; i++)')
rbody.append(' {')
if 'Sampler' in proto.name:
rbody.append(' %s[i] = remap(pPacket->%s[i]);' % (proto.params[-1].name, proto.params[-1].name))
diff --git a/include/xgl.h b/include/xgl.h
index 95595ef..a7b2c6c 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -1303,38 +1303,38 @@
typedef struct _XGL_OFFSET2D
{
- XGL_INT x;
- XGL_INT y;
+ int32_t x;
+ int32_t y;
} XGL_OFFSET2D;
typedef struct _XGL_OFFSET3D
{
- XGL_INT x;
- XGL_INT y;
- XGL_INT z;
+ int32_t x;
+ int32_t y;
+ int32_t z;
} XGL_OFFSET3D;
typedef struct _XGL_EXTENT2D
{
- XGL_INT width;
- XGL_INT height;
+ int32_t width;
+ int32_t height;
} XGL_EXTENT2D;
typedef struct _XGL_EXTENT3D
{
- XGL_INT width;
- XGL_INT height;
- XGL_INT depth;
+ int32_t width;
+ int32_t height;
+ int32_t depth;
} XGL_EXTENT3D;
typedef struct _XGL_VIEWPORT
{
- XGL_FLOAT originX;
- XGL_FLOAT originY;
- XGL_FLOAT width;
- XGL_FLOAT height;
- XGL_FLOAT minDepth;
- XGL_FLOAT maxDepth;
+ float originX;
+ float originY;
+ float width;
+ float height;
+ float minDepth;
+ float maxDepth;
} XGL_VIEWPORT;
typedef struct _XGL_RECT
@@ -1353,31 +1353,31 @@
typedef struct _XGL_PHYSICAL_GPU_PROPERTIES
{
- XGL_UINT32 apiVersion;
- XGL_UINT32 driverVersion;
- XGL_UINT32 vendorId;
- XGL_UINT32 deviceId;
+ uint32_t apiVersion;
+ uint32_t driverVersion;
+ uint32_t vendorId;
+ uint32_t deviceId;
XGL_PHYSICAL_GPU_TYPE gpuType;
- XGL_CHAR gpuName[XGL_MAX_PHYSICAL_GPU_NAME];
- XGL_UINT maxMemRefsPerSubmission;
+ char gpuName[XGL_MAX_PHYSICAL_GPU_NAME];
+ uint32_t maxMemRefsPerSubmission;
XGL_GPU_SIZE maxInlineMemoryUpdateSize;
- XGL_UINT maxBoundDescriptorSets;
- XGL_UINT maxThreadGroupSize;
- XGL_UINT64 timestampFrequency;
- XGL_BOOL multiColorAttachmentClears;
- XGL_UINT maxMemoryHeaps; // at least 8?
- XGL_UINT maxDescriptorSets; // at least 2?
- XGL_UINT maxViewports; // at least 16?
- XGL_UINT maxColorAttachments; // at least 8?
+ uint32_t maxBoundDescriptorSets;
+ uint32_t maxThreadGroupSize;
+ uint64_t timestampFrequency;
+ bool32_t multiColorAttachmentClears;
+ uint32_t maxMemoryHeaps; // at least 8?
+ uint32_t maxDescriptorSets; // at least 2?
+ uint32_t maxViewports; // at least 16?
+ uint32_t maxColorAttachments; // at least 8?
} XGL_PHYSICAL_GPU_PROPERTIES;
typedef struct _XGL_PHYSICAL_GPU_PERFORMANCE
{
- XGL_FLOAT maxGpuClock;
- XGL_FLOAT aluPerClock;
- XGL_FLOAT texPerClock;
- XGL_FLOAT primsPerClock;
- XGL_FLOAT pixelsPerClock;
+ float maxGpuClock;
+ float aluPerClock;
+ float texPerClock;
+ float primsPerClock;
+ float pixelsPerClock;
} XGL_PHYSICAL_GPU_PERFORMANCE;
typedef struct _XGL_GPU_COMPATIBILITY_INFO
@@ -1388,45 +1388,45 @@
typedef struct _XGL_APPLICATION_INFO
{
XGL_STRUCTURE_TYPE sType; // Type of structure. Should be XGL_STRUCTURE_TYPE_APPLICATION_INFO
- const XGL_VOID* pNext; // Next structure in chain
- const XGL_CHAR* pAppName;
- XGL_UINT32 appVersion;
- const XGL_CHAR* pEngineName;
- XGL_UINT32 engineVersion;
- XGL_UINT32 apiVersion;
+ const void* pNext; // Next structure in chain
+ const char* pAppName;
+ uint32_t appVersion;
+ const char* pEngineName;
+ uint32_t engineVersion;
+ uint32_t apiVersion;
} XGL_APPLICATION_INFO;
-typedef XGL_VOID* (XGLAPI *XGL_ALLOC_FUNCTION)(
- XGL_VOID* pUserData,
- XGL_SIZE size,
- XGL_SIZE alignment,
+typedef void* (XGLAPI *XGL_ALLOC_FUNCTION)(
+ void* pUserData,
+ size_t size,
+ size_t alignment,
XGL_SYSTEM_ALLOC_TYPE allocType);
-typedef XGL_VOID (XGLAPI *XGL_FREE_FUNCTION)(
- XGL_VOID* pUserData,
- XGL_VOID* pMem);
+typedef void (XGLAPI *XGL_FREE_FUNCTION)(
+ void* pUserData,
+ void* pMem);
typedef struct _XGL_ALLOC_CALLBACKS
{
- XGL_VOID* pUserData;
+ void* pUserData;
XGL_ALLOC_FUNCTION pfnAlloc;
XGL_FREE_FUNCTION pfnFree;
} XGL_ALLOC_CALLBACKS;
typedef struct _XGL_DEVICE_QUEUE_CREATE_INFO
{
- XGL_UINT queueNodeIndex;
- XGL_UINT queueCount;
+ uint32_t queueNodeIndex;
+ uint32_t queueCount;
} XGL_DEVICE_QUEUE_CREATE_INFO;
typedef struct _XGL_DEVICE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Should be XGL_STRUCTURE_TYPE_DEVICE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT queueRecordCount;
+ const void* pNext; // Pointer to next structure
+ uint32_t queueRecordCount;
const XGL_DEVICE_QUEUE_CREATE_INFO* pRequestedQueues;
- XGL_UINT extensionCount;
- const XGL_CHAR*const* ppEnabledExtensionNames;
+ uint32_t extensionCount;
+ const char*const* ppEnabledExtensionNames;
XGL_VALIDATION_LEVEL maxValidationLevel;
XGL_FLAGS flags; // XGL_DEVICE_CREATE_FLAGS
} XGL_DEVICE_CREATE_INFO;
@@ -1434,29 +1434,29 @@
typedef struct _XGL_LAYER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Should be XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT layerCount;
- const XGL_CHAR *const* ppActiveLayerNames; // layer name from the layer's xglEnumerateLayers())
+ const void* pNext; // Pointer to next structure
+ uint32_t layerCount;
+ const char *const* ppActiveLayerNames; // layer name from the layer's xglEnumerateLayers())
} XGL_LAYER_CREATE_INFO;
typedef struct _XGL_PHYSICAL_GPU_QUEUE_PROPERTIES
{
XGL_FLAGS queueFlags; // XGL_QUEUE_FLAGS
- XGL_UINT queueCount;
- XGL_UINT maxAtomicCounters;
- XGL_BOOL supportsTimestamps;
+ uint32_t queueCount;
+ uint32_t maxAtomicCounters;
+ bool32_t supportsTimestamps;
} XGL_PHYSICAL_GPU_QUEUE_PROPERTIES;
typedef struct _XGL_PHYSICAL_GPU_MEMORY_PROPERTIES
{
- XGL_BOOL supportsMigration;
- XGL_BOOL supportsPinning;
+ bool32_t supportsMigration;
+ bool32_t supportsPinning;
} XGL_PHYSICAL_GPU_MEMORY_PROPERTIES;
typedef struct _XGL_MEMORY_ALLOC_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_GPU_SIZE allocationSize; // Size of memory allocation
XGL_FLAGS memProps; // XGL_MEMORY_PROPERTY_FLAGS
XGL_MEMORY_TYPE memType;
@@ -1468,7 +1468,7 @@
typedef struct _XGL_MEMORY_ALLOC_BUFFER_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS usage; // XGL_BUFFER_USAGE_FLAGS
} XGL_MEMORY_ALLOC_BUFFER_INFO;
@@ -1477,23 +1477,23 @@
typedef struct _XGL_MEMORY_ALLOC_IMAGE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS usage; // XGL_IMAGE_USAGE_FLAGS
XGL_IMAGE_FORMAT_CLASS formatClass;
- XGL_UINT samples;
+ uint32_t samples;
} XGL_MEMORY_ALLOC_IMAGE_INFO;
typedef struct _XGL_MEMORY_OPEN_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_OPEN_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_GPU_MEMORY sharedMem;
} XGL_MEMORY_OPEN_INFO;
typedef struct _XGL_PEER_MEMORY_OPEN_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PEER_MEMORY_OPEN_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_GPU_MEMORY originalMem;
} XGL_PEER_MEMORY_OPEN_INFO;
@@ -1515,7 +1515,7 @@
{
XGL_FLAGS usage; // XGL_IMAGE_USAGE_FLAGS
XGL_IMAGE_FORMAT_CLASS formatClass;
- XGL_UINT samples;
+ uint32_t samples;
} XGL_IMAGE_MEMORY_REQUIREMENTS;
typedef struct _XGL_FORMAT_PROPERTIES
@@ -1527,14 +1527,14 @@
typedef struct _XGL_BUFFER_VIEW_ATTACH_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_BUFFER_VIEW_ATTACH_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_BUFFER_VIEW view;
} XGL_BUFFER_VIEW_ATTACH_INFO;
typedef struct _XGL_IMAGE_VIEW_ATTACH_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_IMAGE_VIEW view;
XGL_IMAGE_LAYOUT layout;
} XGL_IMAGE_VIEW_ATTACH_INFO;
@@ -1542,9 +1542,9 @@
typedef struct _XGL_UPDATE_SAMPLERS
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
- XGL_UINT index;
- XGL_UINT count;
+ const void* pNext;
+ uint32_t index;
+ uint32_t count;
const XGL_SAMPLER* pSamplers;
} XGL_UPDATE_SAMPLERS;
@@ -1557,46 +1557,46 @@
typedef struct _XGL_UPDATE_SAMPLER_TEXTURES
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
- XGL_UINT index;
- XGL_UINT count;
+ const void* pNext;
+ uint32_t index;
+ uint32_t count;
const XGL_SAMPLER_IMAGE_VIEW_INFO* pSamplerImageViews;
} XGL_UPDATE_SAMPLER_TEXTURES;
typedef struct _XGL_UPDATE_IMAGES
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
+ const void* pNext;
XGL_DESCRIPTOR_TYPE descriptorType;
- XGL_UINT index;
- XGL_UINT count;
+ uint32_t index;
+ uint32_t count;
const XGL_IMAGE_VIEW_ATTACH_INFO* const* pImageViews;
} XGL_UPDATE_IMAGES;
typedef struct _XGL_UPDATE_BUFFERS
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
+ const void* pNext;
XGL_DESCRIPTOR_TYPE descriptorType;
- XGL_UINT index;
- XGL_UINT count;
+ uint32_t index;
+ uint32_t count;
const XGL_BUFFER_VIEW_ATTACH_INFO* const* pBufferViews;
} XGL_UPDATE_BUFFERS;
typedef struct _XGL_UPDATE_AS_COPY
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
+ const void* pNext;
XGL_DESCRIPTOR_TYPE descriptorType;
XGL_DESCRIPTOR_SET descriptorSet;
- XGL_UINT descriptorIndex;
- XGL_UINT count;
+ uint32_t descriptorIndex;
+ uint32_t count;
} XGL_UPDATE_AS_COPY;
typedef struct _XGL_BUFFER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_BUFFER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_GPU_SIZE size; // Specified in bytes
XGL_FLAGS usage; // XGL_BUFFER_USAGE_FLAGS
XGL_FLAGS flags; // XGL_BUFFER_CREATE_FLAGS
@@ -1605,7 +1605,7 @@
typedef struct _XGL_BUFFER_VIEW_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_BUFFER buffer;
XGL_BUFFER_VIEW_TYPE viewType;
XGL_GPU_SIZE stride; // Optionally specifies stride between elements
@@ -1618,51 +1618,51 @@
typedef struct _XGL_IMAGE_SUBRESOURCE
{
XGL_IMAGE_ASPECT aspect;
- XGL_UINT mipLevel;
- XGL_UINT arraySlice;
+ uint32_t mipLevel;
+ uint32_t arraySlice;
} XGL_IMAGE_SUBRESOURCE;
typedef struct _XGL_IMAGE_SUBRESOURCE_RANGE
{
XGL_IMAGE_ASPECT aspect;
- XGL_UINT baseMipLevel;
- XGL_UINT mipLevels;
- XGL_UINT baseArraySlice;
- XGL_UINT arraySize;
+ uint32_t baseMipLevel;
+ uint32_t mipLevels;
+ uint32_t baseArraySlice;
+ uint32_t arraySize;
} XGL_IMAGE_SUBRESOURCE_RANGE;
typedef struct _XGL_EVENT_WAIT_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_EVENT_WAIT_INFO
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
- XGL_UINT eventCount; // Number of events to wait on
+ uint32_t eventCount; // Number of events to wait on
const XGL_EVENT* pEvents; // Array of event objects to wait on
XGL_WAIT_EVENT waitEvent; // Pipeline event where the wait should happen
- XGL_UINT memBarrierCount; // Number of memory barriers
- const XGL_VOID* pMemBarriers; // Array of pointers to memory barriers (any of them can be either XGL_MEMORY_BARRIER, XGL_BUFFER_MEMORY_BARRIER, or XGL_IMAGE_MEMORY_BARRIER)
+ uint32_t memBarrierCount; // Number of memory barriers
+ const void* pMemBarriers; // Array of pointers to memory barriers (any of them can be either XGL_MEMORY_BARRIER, XGL_BUFFER_MEMORY_BARRIER, or XGL_IMAGE_MEMORY_BARRIER)
} XGL_EVENT_WAIT_INFO;
typedef struct _XGL_PIPELINE_BARRIER
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_BARRIER
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
- XGL_UINT eventCount; // Number of events to wait on
+ uint32_t eventCount; // Number of events to wait on
const XGL_SET_EVENT* pEvents; // Array of pipeline events to wait on
XGL_WAIT_EVENT waitEvent; // Pipeline event where the wait should happen
- XGL_UINT memBarrierCount; // Number of memory barriers
- const XGL_VOID* pMemBarriers; // Array of pointers to memory barriers (any of them can be either XGL_MEMORY_BARRIER, XGL_BUFFER_MEMORY_BARRIER, or XGL_IMAGE_MEMORY_BARRIER)
+ uint32_t memBarrierCount; // Number of memory barriers
+ const void* pMemBarriers; // Array of pointers to memory barriers (any of them can be either XGL_MEMORY_BARRIER, XGL_BUFFER_MEMORY_BARRIER, or XGL_IMAGE_MEMORY_BARRIER)
} XGL_PIPELINE_BARRIER;
typedef struct _XGL_MEMORY_BARRIER
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MEMORY_BARRIER
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_FLAGS outputMask; // Outputs the barrier should sync (see XGL_MEMORY_OUTPUT_FLAGS)
XGL_FLAGS inputMask; // Inputs the barrier should sync to (see XGL_MEMORY_INPUT_FLAGS)
@@ -1671,7 +1671,7 @@
typedef struct _XGL_BUFFER_MEMORY_BARRIER
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_FLAGS outputMask; // Outputs the barrier should sync (see XGL_MEMORY_OUTPUT_FLAGS)
XGL_FLAGS inputMask; // Inputs the barrier should sync to (see XGL_MEMORY_INPUT_FLAGS)
@@ -1685,7 +1685,7 @@
typedef struct _XGL_IMAGE_MEMORY_BARRIER
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_FLAGS outputMask; // Outputs the barrier should sync (see XGL_MEMORY_OUTPUT_FLAGS)
XGL_FLAGS inputMask; // Inputs the barrier should sync to (see XGL_MEMORY_INPUT_FLAGS)
@@ -1701,13 +1701,13 @@
typedef struct _XGL_IMAGE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure.
+ const void* pNext; // Pointer to next structure.
XGL_IMAGE_TYPE imageType;
XGL_FORMAT format;
XGL_EXTENT3D extent;
- XGL_UINT mipLevels;
- XGL_UINT arraySize;
- XGL_UINT samples;
+ uint32_t mipLevels;
+ uint32_t arraySize;
+ uint32_t samples;
XGL_IMAGE_TILING tiling;
XGL_FLAGS usage; // XGL_IMAGE_USAGE_FLAGS
XGL_FLAGS flags; // XGL_IMAGE_CREATE_FLAGS
@@ -1729,24 +1729,24 @@
typedef struct _XGL_IMAGE_VIEW_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_IMAGE image;
XGL_IMAGE_VIEW_TYPE viewType;
XGL_FORMAT format;
XGL_CHANNEL_MAPPING channels;
XGL_IMAGE_SUBRESOURCE_RANGE subresourceRange;
- XGL_FLOAT minLod;
+ float minLod;
} XGL_IMAGE_VIEW_CREATE_INFO;
typedef struct _XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_IMAGE image;
XGL_FORMAT format;
- XGL_UINT mipLevel;
- XGL_UINT baseArraySlice;
- XGL_UINT arraySize;
+ uint32_t mipLevel;
+ uint32_t baseArraySlice;
+ uint32_t arraySize;
XGL_IMAGE msaaResolveImage;
XGL_IMAGE_SUBRESOURCE_RANGE msaaResolveSubResource;
} XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO;
@@ -1754,11 +1754,11 @@
typedef struct _XGL_DEPTH_STENCIL_VIEW_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_IMAGE image;
- XGL_UINT mipLevel;
- XGL_UINT baseArraySlice;
- XGL_UINT arraySize;
+ uint32_t mipLevel;
+ uint32_t baseArraySlice;
+ uint32_t arraySize;
XGL_IMAGE msaaResolveImage;
XGL_IMAGE_SUBRESOURCE_RANGE msaaResolveSubResource;
XGL_FLAGS flags; // XGL_DEPTH_STENCIL_VIEW_CREATE_FLAGS
@@ -1819,18 +1819,18 @@
typedef struct _XGL_SHADER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_SHADER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_SIZE codeSize; // Specified in bytes
- const XGL_VOID* pCode;
+ const void* pNext; // Pointer to next structure
+ size_t codeSize; // Specified in bytes
+ const void* pCode;
XGL_FLAGS flags; // Reserved
} XGL_SHADER_CREATE_INFO;
typedef struct _XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
+ const void* pNext;
XGL_DESCRIPTOR_TYPE descriptorType;
- XGL_UINT count;
+ uint32_t count;
XGL_FLAGS stageFlags; // XGL_SHADER_STAGE_FLAGS
XGL_SAMPLER immutableSampler;
} XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
@@ -1838,36 +1838,36 @@
typedef struct _XGL_DESCRIPTOR_TYPE_COUNT
{
XGL_DESCRIPTOR_TYPE type;
- XGL_UINT count;
+ uint32_t count;
} XGL_DESCRIPTOR_TYPE_COUNT;
typedef struct _XGL_DESCRIPTOR_REGION_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
- XGL_UINT count;
+ const void* pNext;
+ uint32_t count;
const XGL_DESCRIPTOR_TYPE_COUNT* pTypeCount;
} XGL_DESCRIPTOR_REGION_CREATE_INFO;
typedef struct _XGL_LINK_CONST_BUFFER
{
- XGL_UINT bufferId;
- XGL_SIZE bufferSize;
- const XGL_VOID* pBufferData;
+ uint32_t bufferId;
+ size_t bufferSize;
+ const void* pBufferData;
} XGL_LINK_CONST_BUFFER;
typedef struct _XGL_PIPELINE_SHADER
{
XGL_PIPELINE_SHADER_STAGE stage;
XGL_SHADER shader;
- XGL_UINT linkConstBufferCount;
+ uint32_t linkConstBufferCount;
const XGL_LINK_CONST_BUFFER* pLinkConstBufferInfo;
} XGL_PIPELINE_SHADER;
typedef struct _XGL_COMPUTE_PIPELINE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_PIPELINE_SHADER cs;
XGL_FLAGS flags; // XGL_PIPELINE_CREATE_FLAGS
XGL_DESCRIPTOR_SET_LAYOUT lastSetLayout;
@@ -1875,57 +1875,57 @@
typedef struct _XGL_VERTEX_INPUT_BINDING_DESCRIPTION
{
- XGL_UINT strideInBytes; // Distance between vertices in bytes (0 = no advancement)
+ uint32_t strideInBytes; // Distance between vertices in bytes (0 = no advancement)
XGL_VERTEX_INPUT_STEP_RATE stepRate; // Rate at which binding is incremented
} XGL_VERTEX_INPUT_BINDING_DESCRIPTION;
typedef struct _XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION
{
- XGL_UINT binding; // index into vertexBindingDescriptions
+ uint32_t binding; // index into vertexBindingDescriptions
XGL_FORMAT format; // format of source data
- XGL_UINT offsetInBytes; // Offset of first element in bytes from base of vertex
+ uint32_t offsetInBytes; // Offset of first element in bytes from base of vertex
} XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION;
typedef struct _XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Should be XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
- XGL_UINT bindingCount; // number of bindings
+ uint32_t bindingCount; // number of bindings
const XGL_VERTEX_INPUT_BINDING_DESCRIPTION* pVertexBindingDescriptions;
- XGL_UINT attributeCount; // number of attributes
+ uint32_t attributeCount; // number of attributes
const XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION* pVertexAttributeDescriptions;
} XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO;
typedef struct _XGL_PIPELINE_IA_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_PRIMITIVE_TOPOLOGY topology;
- XGL_BOOL disableVertexReuse; //optional
- XGL_BOOL primitiveRestartEnable;
- XGL_UINT32 primitiveRestartIndex; //optional (GL45)
+ bool32_t disableVertexReuse; //optional
+ bool32_t primitiveRestartEnable;
+ uint32_t primitiveRestartIndex; //optional (GL45)
} XGL_PIPELINE_IA_STATE_CREATE_INFO;
typedef struct _XGL_PIPELINE_TESS_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT patchControlPoints;
- XGL_FLOAT optimalTessFactor;
- XGL_FLOAT fixedTessFactor;
+ const void* pNext; // Pointer to next structure
+ uint32_t patchControlPoints;
+ float optimalTessFactor;
+ float fixedTessFactor;
} XGL_PIPELINE_TESS_STATE_CREATE_INFO;
typedef struct _XGL_PIPELINE_VP_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
- XGL_UINT numViewports;
- XGL_UINT scissorEnable;
+ uint32_t numViewports;
+ uint32_t scissorEnable;
XGL_COORDINATE_ORIGIN clipOrigin; // optional (GL45)
XGL_DEPTH_MODE depthMode; // optional (GL45)
} XGL_PIPELINE_VP_STATE_CREATE_INFO;
@@ -1933,10 +1933,10 @@
typedef struct _XGL_PIPELINE_RS_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_BOOL depthClipEnable;
- XGL_BOOL rasterizerDiscardEnable;
- XGL_BOOL programPointSize; // optional (GL45)
+ const void* pNext; // Pointer to next structure
+ bool32_t depthClipEnable;
+ bool32_t rasterizerDiscardEnable;
+ bool32_t programPointSize; // optional (GL45)
XGL_COORDINATE_ORIGIN pointOrigin; // optional (GL45)
XGL_PROVOKING_VERTEX_CONVENTION provokingVertex; // optional (GL45)
XGL_FILL_MODE fillMode; // optional (GL45)
@@ -1947,17 +1947,17 @@
typedef struct _XGL_PIPELINE_MS_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT samples;
- XGL_BOOL multisampleEnable; // optional (GL45)
- XGL_BOOL sampleShadingEnable; // optional (GL45)
- XGL_FLOAT minSampleShading; // optional (GL45)
+ const void* pNext; // Pointer to next structure
+ uint32_t samples;
+ bool32_t multisampleEnable; // optional (GL45)
+ bool32_t sampleShadingEnable; // optional (GL45)
+ float minSampleShading; // optional (GL45)
XGL_SAMPLE_MASK sampleMask;
} XGL_PIPELINE_MS_STATE_CREATE_INFO;
typedef struct _XGL_PIPELINE_CB_ATTACHMENT_STATE
{
- XGL_BOOL blendEnable;
+ bool32_t blendEnable;
XGL_FORMAT format;
XGL_BLEND srcBlendColor;
XGL_BLEND destBlendColor;
@@ -1965,18 +1965,18 @@
XGL_BLEND srcBlendAlpha;
XGL_BLEND destBlendAlpha;
XGL_BLEND_FUNC blendFuncAlpha;
- XGL_UINT8 channelWriteMask;
+ uint8_t channelWriteMask;
} XGL_PIPELINE_CB_ATTACHMENT_STATE;
typedef struct _XGL_PIPELINE_CB_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_BOOL alphaToCoverageEnable;
- XGL_BOOL dualSourceBlendEnable; // optional (GL45)
- XGL_BOOL logicOpEnable;
+ const void* pNext; // Pointer to next structure
+ bool32_t alphaToCoverageEnable;
+ bool32_t dualSourceBlendEnable; // optional (GL45)
+ bool32_t logicOpEnable;
XGL_LOGIC_OP logicOp;
- XGL_UINT attachmentCount; // # of pAttachments
+ uint32_t attachmentCount; // # of pAttachments
const XGL_PIPELINE_CB_ATTACHMENT_STATE* pAttachments;
} XGL_PIPELINE_CB_STATE_CREATE_INFO;
@@ -1993,11 +1993,11 @@
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
XGL_FORMAT format;
- XGL_BOOL depthTestEnable;
- XGL_BOOL depthWriteEnable;
+ bool32_t depthTestEnable;
+ bool32_t depthWriteEnable;
XGL_COMPARE_FUNC depthFunc;
- XGL_BOOL depthBoundsEnable; // optional (depth_bounds_test)
- XGL_BOOL stencilTestEnable;
+ bool32_t depthBoundsEnable; // optional (depth_bounds_test)
+ bool32_t stencilTestEnable;
XGL_STENCIL_OP_STATE front;
XGL_STENCIL_OP_STATE back;
} XGL_PIPELINE_DS_STATE_CREATE_INFO;
@@ -2006,14 +2006,14 @@
typedef struct _XGL_PIPELINE_SHADER_STAGE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_PIPELINE_SHADER shader;
} XGL_PIPELINE_SHADER_STAGE_CREATE_INFO;
typedef struct _XGL_GRAPHICS_PIPELINE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS flags; // XGL_PIPELINE_CREATE_FLAGS
XGL_DESCRIPTOR_SET_LAYOUT lastSetLayout;
} XGL_GRAPHICS_PIPELINE_CREATE_INFO;
@@ -2021,18 +2021,18 @@
typedef struct _XGL_SAMPLER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_TEX_FILTER magFilter; // Filter mode for magnification
XGL_TEX_FILTER minFilter; // Filter mode for minifiation
XGL_TEX_MIPMAP_MODE mipMode; // Mipmap selection mode
XGL_TEX_ADDRESS addressU;
XGL_TEX_ADDRESS addressV;
XGL_TEX_ADDRESS addressW;
- XGL_FLOAT mipLodBias;
- XGL_UINT maxAnisotropy;
+ float mipLodBias;
+ uint32_t maxAnisotropy;
XGL_COMPARE_FUNC compareFunc;
- XGL_FLOAT minLod;
- XGL_FLOAT maxLod;
+ float minLod;
+ float maxLod;
XGL_BORDER_COLOR_TYPE borderColorType;
} XGL_SAMPLER_CREATE_INFO;
@@ -2040,55 +2040,55 @@
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO
const void* pNext; // Pointer to next structure
- XGL_UINT viewportCount; // number of entries in pViewports
+ uint32_t viewportCount; // number of entries in pViewports
const XGL_VIEWPORT* pViewports;
- XGL_UINT scissorCount; // number of entries in pScissors
+ uint32_t scissorCount; // number of entries in pScissors
const XGL_RECT* pScissors;
} XGL_DYNAMIC_VP_STATE_CREATE_INFO;
typedef struct _XGL_DYNAMIC_RS_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_FLOAT depthBias;
- XGL_FLOAT depthBiasClamp;
- XGL_FLOAT slopeScaledDepthBias;
- XGL_FLOAT pointSize; // optional (GL45) - Size of point
- XGL_FLOAT pointFadeThreshold; // optional (GL45) - Size of point fade threshold
- XGL_FLOAT lineWidth; // optional (GL45) - Width of lines
+ const void* pNext; // Pointer to next structure
+ float depthBias;
+ float depthBiasClamp;
+ float slopeScaledDepthBias;
+ float pointSize; // optional (GL45) - Size of point
+ float pointFadeThreshold; // optional (GL45) - Size of point fade threshold
+ float lineWidth; // optional (GL45) - Width of lines
} XGL_DYNAMIC_RS_STATE_CREATE_INFO;
typedef struct _XGL_MSAA_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_MSAA_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT samples;
+ const void* pNext; // Pointer to next structure
+ uint32_t samples;
XGL_SAMPLE_MASK sampleMask;
} XGL_MSAA_STATE_CREATE_INFO;
typedef struct _XGL_DYNAMIC_CB_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_FLOAT blendConst[4];
+ const void* pNext; // Pointer to next structure
+ float blendConst[4];
} XGL_DYNAMIC_CB_STATE_CREATE_INFO;
typedef struct _XGL_DYNAMIC_DS_STATE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_FLOAT minDepth; // optional (depth_bounds_test)
- XGL_FLOAT maxDepth; // optional (depth_bounds_test)
- XGL_UINT32 stencilReadMask;
- XGL_UINT32 stencilWriteMask;
- XGL_UINT32 stencilFrontRef;
- XGL_UINT32 stencilBackRef;
+ const void* pNext; // Pointer to next structure
+ float minDepth; // optional (depth_bounds_test)
+ float maxDepth; // optional (depth_bounds_test)
+ uint32_t stencilReadMask;
+ uint32_t stencilWriteMask;
+ uint32_t stencilFrontRef;
+ uint32_t stencilBackRef;
} XGL_DYNAMIC_DS_STATE_CREATE_INFO;
typedef struct _XGL_CMD_BUFFER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_QUEUE_TYPE queueType;
XGL_FLAGS flags;
} XGL_CMD_BUFFER_CREATE_INFO;
@@ -2096,7 +2096,7 @@
typedef struct _XGL_CMD_BUFFER_BEGIN_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS flags; // XGL_CMD_BUFFER_BUILD_FLAGS
} XGL_CMD_BUFFER_BEGIN_INFO;
@@ -2104,7 +2104,7 @@
typedef struct _XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_RENDER_PASS renderPass;
XGL_RENDER_PASS_OPERATION operation;
@@ -2114,20 +2114,20 @@
// Union allowing specification of floating point or raw color data. Actual value selected is based on image being cleared.
typedef union _XGL_CLEAR_COLOR_VALUE
{
- XGL_FLOAT floatColor[4];
- XGL_UINT rawColor[4];
+ float floatColor[4];
+ uint32_t rawColor[4];
} XGL_CLEAR_COLOR_VALUE;
typedef struct _XGL_CLEAR_COLOR
{
XGL_CLEAR_COLOR_VALUE color;
- XGL_BOOL useRawValue;
+ bool32_t useRawValue;
} XGL_CLEAR_COLOR;
typedef struct _XGL_RENDER_PASS_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_RECT renderArea;
XGL_FRAMEBUFFER framebuffer;
@@ -2135,10 +2135,10 @@
const XGL_ATTACHMENT_STORE_OP* pColorStoreOps; // Array of size equivalent to the number of attachments in the framebuffer
const XGL_CLEAR_COLOR* pColorLoadClearValues; // Array of size equivalent to the number of attachments in the framebuffer
XGL_ATTACHMENT_LOAD_OP depthLoadOp;
- XGL_FLOAT depthLoadClearValue;
+ float depthLoadClearValue;
XGL_ATTACHMENT_STORE_OP depthStoreOp;
XGL_ATTACHMENT_LOAD_OP stencilLoadOp;
- XGL_UINT32 stencilLoadClearValue;
+ uint32_t stencilLoadClearValue;
XGL_ATTACHMENT_STORE_OP stencilStoreOp;
} XGL_RENDER_PASS_CREATE_INFO;
@@ -2151,126 +2151,126 @@
typedef struct _XGL_EVENT_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS flags; // Reserved
} XGL_EVENT_CREATE_INFO;
typedef struct _XGL_FENCE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_FLAGS flags; // Reserved
} XGL_FENCE_CREATE_INFO;
typedef struct _XGL_QUEUE_SEMAPHORE_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
- XGL_UINT initialCount;
+ const void* pNext; // Pointer to next structure
+ uint32_t initialCount;
XGL_FLAGS flags; // XGL_SEMAPHORE_CREATE_FLAGS
} XGL_QUEUE_SEMAPHORE_CREATE_INFO;
typedef struct _XGL_QUEUE_SEMAPHORE_OPEN_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUEUE_SEMAPHORE_OPEN_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_QUEUE_SEMAPHORE sharedSemaphore;
} XGL_QUEUE_SEMAPHORE_OPEN_INFO;
typedef struct _XGL_PIPELINE_STATISTICS_DATA
{
- XGL_UINT64 fsInvocations; // Fragment shader invocations
- XGL_UINT64 cPrimitives; // Clipper primitives
- XGL_UINT64 cInvocations; // Clipper invocations
- XGL_UINT64 vsInvocations; // Vertex shader invocations
- XGL_UINT64 gsInvocations; // Geometry shader invocations
- XGL_UINT64 gsPrimitives; // Geometry shader primitives
- XGL_UINT64 iaPrimitives; // Input primitives
- XGL_UINT64 iaVertices; // Input vertices
- XGL_UINT64 tcsInvocations; // Tessellation control shader invocations
- XGL_UINT64 tesInvocations; // Tessellation evaluation shader invocations
- XGL_UINT64 csInvocations; // Compute shader invocations
+ uint64_t fsInvocations; // Fragment shader invocations
+ uint64_t cPrimitives; // Clipper primitives
+ uint64_t cInvocations; // Clipper invocations
+ uint64_t vsInvocations; // Vertex shader invocations
+ uint64_t gsInvocations; // Geometry shader invocations
+ uint64_t gsPrimitives; // Geometry shader primitives
+ uint64_t iaPrimitives; // Input primitives
+ uint64_t iaVertices; // Input vertices
+ uint64_t tcsInvocations; // Tessellation control shader invocations
+ uint64_t tesInvocations; // Tessellation evaluation shader invocations
+ uint64_t csInvocations; // Compute shader invocations
} XGL_PIPELINE_STATISTICS_DATA;
typedef struct _XGL_QUERY_POOL_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
XGL_QUERY_TYPE queryType;
- XGL_UINT slots;
+ uint32_t slots;
} XGL_QUERY_POOL_CREATE_INFO;
typedef struct _XGL_FRAMEBUFFER_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
- XGL_UINT colorAttachmentCount;
+ uint32_t colorAttachmentCount;
const XGL_COLOR_ATTACHMENT_BIND_INFO* pColorAttachments;
const XGL_DEPTH_STENCIL_BIND_INFO* pDepthStencilAttachment;
- XGL_UINT sampleCount;
- XGL_UINT width;
- XGL_UINT height;
- XGL_UINT layers;
+ uint32_t sampleCount;
+ uint32_t width;
+ uint32_t height;
+ uint32_t layers;
} XGL_FRAMEBUFFER_CREATE_INFO;
typedef struct _XGL_DRAW_INDIRECT_CMD
{
- XGL_UINT32 vertexCount;
- XGL_UINT32 instanceCount;
- XGL_UINT32 firstVertex;
- XGL_UINT32 firstInstance;
+ uint32_t vertexCount;
+ uint32_t instanceCount;
+ uint32_t firstVertex;
+ uint32_t firstInstance;
} XGL_DRAW_INDIRECT_CMD;
typedef struct _XGL_DRAW_INDEXED_INDIRECT_CMD
{
- XGL_UINT32 indexCount;
- XGL_UINT32 instanceCount;
- XGL_UINT32 firstIndex;
- XGL_INT32 vertexOffset;
- XGL_UINT32 firstInstance;
+ uint32_t indexCount;
+ uint32_t instanceCount;
+ uint32_t firstIndex;
+ int32_t vertexOffset;
+ uint32_t firstInstance;
} XGL_DRAW_INDEXED_INDIRECT_CMD;
typedef struct _XGL_DISPATCH_INDIRECT_CMD
{
- XGL_UINT32 x;
- XGL_UINT32 y;
- XGL_UINT32 z;
+ uint32_t x;
+ uint32_t y;
+ uint32_t z;
} XGL_DISPATCH_INDIRECT_CMD;
// ------------------------------------------------------------------------------------------------
// API functions
-typedef XGL_RESULT (XGLAPI *xglInitAndEnumerateGpusType)(const XGL_APPLICATION_INFO* pAppInfo, const XGL_ALLOC_CALLBACKS* pAllocCb, XGL_UINT maxGpus, XGL_UINT* pGpuCount, XGL_PHYSICAL_GPU* pGpus);
-typedef XGL_RESULT (XGLAPI *xglGetGpuInfoType)(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData);
-typedef XGL_VOID * (XGLAPI *xglGetProcAddrType)(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName);
+typedef XGL_RESULT (XGLAPI *xglInitAndEnumerateGpusType)(const XGL_APPLICATION_INFO* pAppInfo, const XGL_ALLOC_CALLBACKS* pAllocCb, uint32_t maxGpus, uint32_t* pGpuCount, XGL_PHYSICAL_GPU* pGpus);
+typedef XGL_RESULT (XGLAPI *xglGetGpuInfoType)(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, size_t* pDataSize, void* pData);
+typedef void * (XGLAPI *xglGetProcAddrType)(XGL_PHYSICAL_GPU gpu, const char * pName);
typedef XGL_RESULT (XGLAPI *xglCreateDeviceType)(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo, XGL_DEVICE* pDevice);
typedef XGL_RESULT (XGLAPI *xglDestroyDeviceType)(XGL_DEVICE device);
-typedef XGL_RESULT (XGLAPI *xglGetExtensionSupportType)(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pExtName);
-typedef XGL_RESULT (XGLAPI *xglEnumerateLayersType)(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved);
-typedef XGL_RESULT (XGLAPI *xglGetDeviceQueueType)(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, XGL_UINT queueIndex, XGL_QUEUE* pQueue);
-typedef XGL_RESULT (XGLAPI *xglQueueSubmitType)(XGL_QUEUE queue, XGL_UINT cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence);
-typedef XGL_RESULT (XGLAPI *xglQueueSetGlobalMemReferencesType)(XGL_QUEUE queue, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs);
+typedef XGL_RESULT (XGLAPI *xglGetExtensionSupportType)(XGL_PHYSICAL_GPU gpu, const char* pExtName);
+typedef XGL_RESULT (XGLAPI *xglEnumerateLayersType)(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved);
+typedef XGL_RESULT (XGLAPI *xglGetDeviceQueueType)(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, uint32_t queueIndex, XGL_QUEUE* pQueue);
+typedef XGL_RESULT (XGLAPI *xglQueueSubmitType)(XGL_QUEUE queue, uint32_t cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence);
+typedef XGL_RESULT (XGLAPI *xglQueueSetGlobalMemReferencesType)(XGL_QUEUE queue, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs);
typedef XGL_RESULT (XGLAPI *xglQueueWaitIdleType)(XGL_QUEUE queue);
typedef XGL_RESULT (XGLAPI *xglDeviceWaitIdleType)(XGL_DEVICE device);
typedef XGL_RESULT (XGLAPI *xglAllocMemoryType)(XGL_DEVICE device, const XGL_MEMORY_ALLOC_INFO* pAllocInfo, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglFreeMemoryType)(XGL_GPU_MEMORY mem);
typedef XGL_RESULT (XGLAPI *xglSetMemoryPriorityType)(XGL_GPU_MEMORY mem, XGL_MEMORY_PRIORITY priority);
-typedef XGL_RESULT (XGLAPI *xglMapMemoryType)(XGL_GPU_MEMORY mem, XGL_FLAGS flags, XGL_VOID** ppData);
+typedef XGL_RESULT (XGLAPI *xglMapMemoryType)(XGL_GPU_MEMORY mem, XGL_FLAGS flags, void** ppData);
typedef XGL_RESULT (XGLAPI *xglUnmapMemoryType)(XGL_GPU_MEMORY mem);
-typedef XGL_RESULT (XGLAPI *xglPinSystemMemoryType)(XGL_DEVICE device, const XGL_VOID* pSysMem, XGL_SIZE memSize, XGL_GPU_MEMORY* pMem);
+typedef XGL_RESULT (XGLAPI *xglPinSystemMemoryType)(XGL_DEVICE device, const void* pSysMem, size_t memSize, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglGetMultiGpuCompatibilityType)(XGL_PHYSICAL_GPU gpu0, XGL_PHYSICAL_GPU gpu1, XGL_GPU_COMPATIBILITY_INFO* pInfo);
typedef XGL_RESULT (XGLAPI *xglOpenSharedMemoryType)(XGL_DEVICE device, const XGL_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglOpenSharedQueueSemaphoreType)(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_OPEN_INFO* pOpenInfo, XGL_QUEUE_SEMAPHORE* pSemaphore);
typedef XGL_RESULT (XGLAPI *xglOpenPeerMemoryType)(XGL_DEVICE device, const XGL_PEER_MEMORY_OPEN_INFO* pOpenInfo, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglOpenPeerImageType)(XGL_DEVICE device, const XGL_PEER_IMAGE_OPEN_INFO* pOpenInfo, XGL_IMAGE* pImage, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglDestroyObjectType)(XGL_OBJECT object);
-typedef XGL_RESULT (XGLAPI *xglGetObjectInfoType)(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData);
-typedef XGL_RESULT (XGLAPI *xglBindObjectMemoryType)(XGL_OBJECT object, XGL_UINT allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
-typedef XGL_RESULT (XGLAPI *xglBindObjectMemoryRangeType)(XGL_OBJECT object, XGL_UINT allocationIdx, XGL_GPU_SIZE rangeOffset, XGL_GPU_SIZE rangeSize, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
-typedef XGL_RESULT (XGLAPI *xglBindImageMemoryRangeType)(XGL_IMAGE image, XGL_UINT allocationIdx, const XGL_IMAGE_MEMORY_BIND_INFO* bindInfo, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
+typedef XGL_RESULT (XGLAPI *xglGetObjectInfoType)(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, size_t* pDataSize, void* pData);
+typedef XGL_RESULT (XGLAPI *xglBindObjectMemoryType)(XGL_OBJECT object, uint32_t allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
+typedef XGL_RESULT (XGLAPI *xglBindObjectMemoryRangeType)(XGL_OBJECT object, uint32_t allocationIdx, XGL_GPU_SIZE rangeOffset, XGL_GPU_SIZE rangeSize, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
+typedef XGL_RESULT (XGLAPI *xglBindImageMemoryRangeType)(XGL_IMAGE image, uint32_t allocationIdx, const XGL_IMAGE_MEMORY_BIND_INFO* bindInfo, XGL_GPU_MEMORY mem, XGL_GPU_SIZE memOffset);
typedef XGL_RESULT (XGLAPI *xglCreateFenceType)(XGL_DEVICE device, const XGL_FENCE_CREATE_INFO* pCreateInfo, XGL_FENCE* pFence);
typedef XGL_RESULT (XGLAPI *xglGetFenceStatusType)(XGL_FENCE fence);
-typedef XGL_RESULT (XGLAPI *xglWaitForFencesType)(XGL_DEVICE device, XGL_UINT fenceCount, const XGL_FENCE* pFences, XGL_BOOL waitAll, XGL_UINT64 timeout);
+typedef XGL_RESULT (XGLAPI *xglWaitForFencesType)(XGL_DEVICE device, uint32_t fenceCount, const XGL_FENCE* pFences, bool32_t waitAll, uint64_t timeout);
typedef XGL_RESULT (XGLAPI *xglCreateQueueSemaphoreType)(XGL_DEVICE device, const XGL_QUEUE_SEMAPHORE_CREATE_INFO* pCreateInfo, XGL_QUEUE_SEMAPHORE* pSemaphore);
typedef XGL_RESULT (XGLAPI *xglSignalQueueSemaphoreType)(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore);
typedef XGL_RESULT (XGLAPI *xglWaitQueueSemaphoreType)(XGL_QUEUE queue, XGL_QUEUE_SEMAPHORE semaphore);
@@ -2279,32 +2279,32 @@
typedef XGL_RESULT (XGLAPI *xglSetEventType)(XGL_EVENT event);
typedef XGL_RESULT (XGLAPI *xglResetEventType)(XGL_EVENT event);
typedef XGL_RESULT (XGLAPI *xglCreateQueryPoolType)(XGL_DEVICE device, const XGL_QUERY_POOL_CREATE_INFO* pCreateInfo, XGL_QUERY_POOL* pQueryPool);
-typedef XGL_RESULT (XGLAPI *xglGetQueryPoolResultsType)(XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount, XGL_SIZE* pDataSize, XGL_VOID* pData);
-typedef XGL_RESULT (XGLAPI *xglGetFormatInfoType)(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData);
+typedef XGL_RESULT (XGLAPI *xglGetQueryPoolResultsType)(XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount, size_t* pDataSize, void* pData);
+typedef XGL_RESULT (XGLAPI *xglGetFormatInfoType)(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, size_t* pDataSize, void* pData);
typedef XGL_RESULT (XGLAPI *xglCreateBufferType)(XGL_DEVICE device, const XGL_BUFFER_CREATE_INFO* pCreateInfo, XGL_BUFFER* pBuffer);
typedef XGL_RESULT (XGLAPI *xglCreateBufferViewType)(XGL_DEVICE device, const XGL_BUFFER_VIEW_CREATE_INFO* pCreateInfo, XGL_BUFFER_VIEW* pView);
typedef XGL_RESULT (XGLAPI *xglCreateImageType)(XGL_DEVICE device, const XGL_IMAGE_CREATE_INFO* pCreateInfo, XGL_IMAGE* pImage);
typedef XGL_RESULT (XGLAPI *xglSetFastClearColorType)(XGL_IMAGE image, const float color[4]);
typedef XGL_RESULT (XGLAPI *xglSetFastClearDepthType)(XGL_IMAGE image, float depth);
-typedef XGL_RESULT (XGLAPI *xglGetImageSubresourceInfoType)(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData);
+typedef XGL_RESULT (XGLAPI *xglGetImageSubresourceInfoType)(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, size_t* pDataSize, void* pData);
typedef XGL_RESULT (XGLAPI *xglCreateImageViewType)(XGL_DEVICE device, const XGL_IMAGE_VIEW_CREATE_INFO* pCreateInfo, XGL_IMAGE_VIEW* pView);
typedef XGL_RESULT (XGLAPI *xglCreateColorAttachmentViewType)(XGL_DEVICE device, const XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO* pCreateInfo, XGL_COLOR_ATTACHMENT_VIEW* pView);
typedef XGL_RESULT (XGLAPI *xglCreateDepthStencilViewType)(XGL_DEVICE device, const XGL_DEPTH_STENCIL_VIEW_CREATE_INFO* pCreateInfo, XGL_DEPTH_STENCIL_VIEW* pView);
typedef XGL_RESULT (XGLAPI *xglCreateShaderType)(XGL_DEVICE device, const XGL_SHADER_CREATE_INFO* pCreateInfo, XGL_SHADER* pShader);
typedef XGL_RESULT (XGLAPI *xglCreateGraphicsPipelineType)(XGL_DEVICE device, const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline);
typedef XGL_RESULT (XGLAPI *xglCreateComputePipelineType)(XGL_DEVICE device, const XGL_COMPUTE_PIPELINE_CREATE_INFO* pCreateInfo, XGL_PIPELINE* pPipeline);
-typedef XGL_RESULT (XGLAPI *xglStorePipelineType)(XGL_PIPELINE pipeline, XGL_SIZE* pDataSize, XGL_VOID* pData);
-typedef XGL_RESULT (XGLAPI *xglLoadPipelineType)(XGL_DEVICE device, XGL_SIZE dataSize, const XGL_VOID* pData, XGL_PIPELINE* pPipeline);
+typedef XGL_RESULT (XGLAPI *xglStorePipelineType)(XGL_PIPELINE pipeline, size_t* pDataSize, void* pData);
+typedef XGL_RESULT (XGLAPI *xglLoadPipelineType)(XGL_DEVICE device, size_t dataSize, const void* pData, XGL_PIPELINE* pPipeline);
typedef XGL_RESULT (XGLAPI *xglCreatePipelineDeltaType)(XGL_DEVICE device, XGL_PIPELINE p1, XGL_PIPELINE p2, XGL_PIPELINE_DELTA* delta);
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 XGL_UINT* 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* 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, XGL_UINT maxSets, const XGL_DESCRIPTOR_REGION_CREATE_INFO* pCreateInfo, XGL_DESCRIPTOR_REGION* pDescriptorRegion);
+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, XGL_UINT count, const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts, XGL_DESCRIPTOR_SET* pDescriptorSets, XGL_UINT* pCount);
-typedef XGL_VOID (XGLAPI *xglClearDescriptorSetsType)(XGL_DESCRIPTOR_REGION descriptorRegion, XGL_UINT count, const XGL_DESCRIPTOR_SET* pDescriptorSets);
-typedef XGL_VOID (XGLAPI *xglUpdateDescriptorsType)(XGL_DESCRIPTOR_SET descriptorSet, const XGL_VOID* pUpdateChain);
+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 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);
typedef XGL_RESULT (XGLAPI *xglCreateDynamicColorBlendStateType)(XGL_DEVICE device, const XGL_DYNAMIC_CB_STATE_CREATE_INFO* pCreateInfo, XGL_DYNAMIC_CB_STATE_OBJECT* pState);
@@ -2313,40 +2313,40 @@
typedef XGL_RESULT (XGLAPI *xglBeginCommandBufferType)(XGL_CMD_BUFFER cmdBuffer, const XGL_CMD_BUFFER_BEGIN_INFO* pBeginInfo);
typedef XGL_RESULT (XGLAPI *xglEndCommandBufferType)(XGL_CMD_BUFFER cmdBuffer);
typedef XGL_RESULT (XGLAPI *xglResetCommandBufferType)(XGL_CMD_BUFFER cmdBuffer);
-typedef XGL_VOID (XGLAPI *xglCmdBindPipelineType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline);
-typedef XGL_VOID (XGLAPI *xglCmdBindPipelineDeltaType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta);
-typedef XGL_VOID (XGLAPI *xglCmdBindDynamicStateObjectType)(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_DYNAMIC_STATE_OBJECT state);
-typedef XGL_VOID (XGLAPI *xglCmdBindDescriptorSetType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_DESCRIPTOR_SET descriptorSet, const XGL_UINT* pUserData);
-typedef XGL_VOID (XGLAPI *xglCmdBindVertexBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_UINT binding);
-typedef XGL_VOID (XGLAPI *xglCmdBindIndexBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType);
-typedef XGL_VOID (XGLAPI *xglCmdDrawType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount);
-typedef XGL_VOID (XGLAPI *xglCmdDrawIndexedType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstIndex, XGL_UINT indexCount, XGL_INT vertexOffset, XGL_UINT firstInstance, XGL_UINT instanceCount);
-typedef XGL_VOID (XGLAPI *xglCmdDrawIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride);
-typedef XGL_VOID (XGLAPI *xglCmdDrawIndexedIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride);
-typedef XGL_VOID (XGLAPI *xglCmdDispatchType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT x, XGL_UINT y, XGL_UINT z);
-typedef XGL_VOID (XGLAPI *xglCmdDispatchIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset);
-typedef XGL_VOID (XGLAPI *xglCmdCopyBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER srcBuffer, XGL_BUFFER destBuffer, XGL_UINT regionCount, const XGL_BUFFER_COPY* pRegions);
-typedef XGL_VOID (XGLAPI *xglCmdCopyImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_IMAGE_COPY* pRegions);
-typedef XGL_VOID (XGLAPI *xglCmdCopyBufferToImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER srcBuffer, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions);
-typedef XGL_VOID (XGLAPI *xglCmdCopyImageToBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_BUFFER destBuffer, XGL_UINT regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions);
-typedef XGL_VOID (XGLAPI *xglCmdCloneImageDataType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout);
-typedef XGL_VOID (XGLAPI *xglCmdUpdateBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const XGL_UINT32* pData);
-typedef XGL_VOID (XGLAPI *xglCmdFillBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, XGL_UINT32 data);
-typedef XGL_VOID (XGLAPI *xglCmdClearColorImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_FLOAT color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-typedef XGL_VOID (XGLAPI *xglCmdClearColorImageRawType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_UINT32 color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-typedef XGL_VOID (XGLAPI *xglCmdClearDepthStencilType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_FLOAT depth, XGL_UINT32 stencil, XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-typedef XGL_VOID (XGLAPI *xglCmdResolveImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT rectCount, const XGL_IMAGE_RESOLVE* pRects);
-typedef XGL_VOID (XGLAPI *xglCmdSetEventType)(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent);
-typedef XGL_VOID (XGLAPI *xglCmdResetEventType)(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event);
-typedef XGL_VOID (XGLAPI *xglCmdWaitEventsType)(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo);
-typedef XGL_VOID (XGLAPI *xglCmdPipelineBarrierType)(XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier);
-typedef XGL_VOID (XGLAPI *xglCmdBeginQueryType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot, XGL_FLAGS flags);
-typedef XGL_VOID (XGLAPI *xglCmdEndQueryType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot);
-typedef XGL_VOID (XGLAPI *xglCmdResetQueryPoolType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount);
-typedef XGL_VOID (XGLAPI *xglCmdWriteTimestampType)(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset);
-typedef XGL_VOID (XGLAPI *xglCmdInitAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, const XGL_UINT32* pData);
-typedef XGL_VOID (XGLAPI *xglCmdLoadAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_BUFFER srcBuffer, XGL_GPU_SIZE srcOffset);
-typedef XGL_VOID (XGLAPI *xglCmdSaveAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset);
+typedef void (XGLAPI *xglCmdBindPipelineType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline);
+typedef void (XGLAPI *xglCmdBindPipelineDeltaType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta);
+typedef void (XGLAPI *xglCmdBindDynamicStateObjectType)(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_DYNAMIC_STATE_OBJECT state);
+typedef void (XGLAPI *xglCmdBindDescriptorSetType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_DESCRIPTOR_SET descriptorSet, const uint32_t* pUserData);
+typedef void (XGLAPI *xglCmdBindVertexBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t binding);
+typedef void (XGLAPI *xglCmdBindIndexBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType);
+typedef void (XGLAPI *xglCmdDrawType)(XGL_CMD_BUFFER cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount);
+typedef void (XGLAPI *xglCmdDrawIndexedType)(XGL_CMD_BUFFER cmdBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount);
+typedef void (XGLAPI *xglCmdDrawIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride);
+typedef void (XGLAPI *xglCmdDrawIndexedIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride);
+typedef void (XGLAPI *xglCmdDispatchType)(XGL_CMD_BUFFER cmdBuffer, uint32_t x, uint32_t y, uint32_t z);
+typedef void (XGLAPI *xglCmdDispatchIndirectType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER buffer, XGL_GPU_SIZE offset);
+typedef void (XGLAPI *xglCmdCopyBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER srcBuffer, XGL_BUFFER destBuffer, uint32_t regionCount, const XGL_BUFFER_COPY* pRegions);
+typedef void (XGLAPI *xglCmdCopyImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t regionCount, const XGL_IMAGE_COPY* pRegions);
+typedef void (XGLAPI *xglCmdCopyBufferToImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER srcBuffer, XGL_IMAGE destImage, uint32_t regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions);
+typedef void (XGLAPI *xglCmdCopyImageToBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_BUFFER destBuffer, uint32_t regionCount, const XGL_BUFFER_IMAGE_COPY* pRegions);
+typedef void (XGLAPI *xglCmdCloneImageDataType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout);
+typedef void (XGLAPI *xglCmdUpdateBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const uint32_t* pData);
+typedef void (XGLAPI *xglCmdFillBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, uint32_t data);
+typedef void (XGLAPI *xglCmdClearColorImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
+typedef void (XGLAPI *xglCmdClearColorImageRawType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
+typedef void (XGLAPI *xglCmdClearDepthStencilType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
+typedef void (XGLAPI *xglCmdResolveImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t rectCount, const XGL_IMAGE_RESOLVE* pRects);
+typedef void (XGLAPI *xglCmdSetEventType)(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent);
+typedef void (XGLAPI *xglCmdResetEventType)(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event);
+typedef void (XGLAPI *xglCmdWaitEventsType)(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo);
+typedef void (XGLAPI *xglCmdPipelineBarrierType)(XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier);
+typedef void (XGLAPI *xglCmdBeginQueryType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot, XGL_FLAGS flags);
+typedef void (XGLAPI *xglCmdEndQueryType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot);
+typedef void (XGLAPI *xglCmdResetQueryPoolType)(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount);
+typedef void (XGLAPI *xglCmdWriteTimestampType)(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset);
+typedef void (XGLAPI *xglCmdInitAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData);
+typedef void (XGLAPI *xglCmdLoadAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_BUFFER srcBuffer, XGL_GPU_SIZE srcOffset);
+typedef void (XGLAPI *xglCmdSaveAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset);
typedef XGL_RESULT (XGLAPI *xglCreateFramebufferType)(XGL_DEVICE device, const XGL_FRAMEBUFFER_CREATE_INFO* pCreateInfo, XGL_FRAMEBUFFER* pFramebuffer);
typedef XGL_RESULT (XGLAPI *xglCreateRenderPassType)(XGL_DEVICE device, const XGL_RENDER_PASS_CREATE_INFO* pCreateInfo, XGL_RENDER_PASS* pRenderPass);
@@ -2357,19 +2357,19 @@
XGL_RESULT XGLAPI xglInitAndEnumerateGpus(
const XGL_APPLICATION_INFO* pAppInfo,
const XGL_ALLOC_CALLBACKS* pAllocCb,
- XGL_UINT maxGpus,
- XGL_UINT* pGpuCount,
+ uint32_t maxGpus,
+ uint32_t* pGpuCount,
XGL_PHYSICAL_GPU* pGpus);
XGL_RESULT XGLAPI xglGetGpuInfo(
XGL_PHYSICAL_GPU gpu,
XGL_PHYSICAL_GPU_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ size_t* pDataSize,
+ void* pData);
-XGL_VOID * XGLAPI xglGetProcAddr(
+void * XGLAPI xglGetProcAddr(
XGL_PHYSICAL_GPU gpu,
- const XGL_CHAR* pName);
+ const char* pName);
// Device functions
@@ -2385,36 +2385,36 @@
XGL_RESULT XGLAPI xglGetExtensionSupport(
XGL_PHYSICAL_GPU gpu,
- const XGL_CHAR* pExtName);
+ const char* pExtName);
// Layer discovery function
XGL_RESULT XGLAPI xglEnumerateLayers(
XGL_PHYSICAL_GPU gpu,
- XGL_SIZE maxLayerCount,
- XGL_SIZE maxStringSize,
- XGL_SIZE* pOutLayerCount,
- XGL_CHAR* const* pOutLayers,
- XGL_VOID* pReserved);
+ size_t maxLayerCount,
+ size_t maxStringSize,
+ size_t* pOutLayerCount,
+ char* const* pOutLayers,
+ void* pReserved);
// Queue functions
XGL_RESULT XGLAPI xglGetDeviceQueue(
XGL_DEVICE device,
XGL_QUEUE_TYPE queueType,
- XGL_UINT queueIndex,
+ uint32_t queueIndex,
XGL_QUEUE* pQueue);
XGL_RESULT XGLAPI xglQueueSubmit(
XGL_QUEUE queue,
- XGL_UINT cmdBufferCount,
+ uint32_t cmdBufferCount,
const XGL_CMD_BUFFER* pCmdBuffers,
- XGL_UINT memRefCount,
+ uint32_t memRefCount,
const XGL_MEMORY_REF* pMemRefs,
XGL_FENCE fence);
XGL_RESULT XGLAPI xglQueueSetGlobalMemReferences(
XGL_QUEUE queue,
- XGL_UINT memRefCount,
+ uint32_t memRefCount,
const XGL_MEMORY_REF* pMemRefs);
XGL_RESULT XGLAPI xglQueueWaitIdle(
@@ -2440,15 +2440,15 @@
XGL_RESULT XGLAPI xglMapMemory(
XGL_GPU_MEMORY mem,
XGL_FLAGS flags, // Reserved
- XGL_VOID** ppData);
+ void** ppData);
XGL_RESULT XGLAPI xglUnmapMemory(
XGL_GPU_MEMORY mem);
XGL_RESULT XGLAPI xglPinSystemMemory(
XGL_DEVICE device,
- const XGL_VOID* pSysMem,
- XGL_SIZE memSize,
+ const void* pSysMem,
+ size_t memSize,
XGL_GPU_MEMORY* pMem);
// Multi-device functions
@@ -2487,18 +2487,18 @@
XGL_RESULT XGLAPI xglGetObjectInfo(
XGL_BASE_OBJECT object,
XGL_OBJECT_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ size_t* pDataSize,
+ void* pData);
XGL_RESULT XGLAPI xglBindObjectMemory(
XGL_OBJECT object,
- XGL_UINT allocationIdx,
+ uint32_t allocationIdx,
XGL_GPU_MEMORY mem,
XGL_GPU_SIZE memOffset);
XGL_RESULT XGLAPI xglBindObjectMemoryRange(
XGL_OBJECT object,
- XGL_UINT allocationIdx,
+ uint32_t allocationIdx,
XGL_GPU_SIZE rangeOffset,
XGL_GPU_SIZE rangeSize,
XGL_GPU_MEMORY mem,
@@ -2506,7 +2506,7 @@
XGL_RESULT XGLAPI xglBindImageMemoryRange(
XGL_IMAGE image,
- XGL_UINT allocationIdx,
+ uint32_t allocationIdx,
const XGL_IMAGE_MEMORY_BIND_INFO* bindInfo,
XGL_GPU_MEMORY mem,
XGL_GPU_SIZE memOffset);
@@ -2523,10 +2523,10 @@
XGL_RESULT XGLAPI xglWaitForFences(
XGL_DEVICE device,
- XGL_UINT fenceCount,
+ uint32_t fenceCount,
const XGL_FENCE* pFences,
- XGL_BOOL waitAll,
- XGL_UINT64 timeout);
+ bool32_t waitAll,
+ uint64_t timeout);
// Queue semaphore functions
@@ -2568,10 +2568,10 @@
XGL_RESULT XGLAPI xglGetQueryPoolResults(
XGL_QUERY_POOL queryPool,
- XGL_UINT startQuery,
- XGL_UINT queryCount,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ uint32_t startQuery,
+ uint32_t queryCount,
+ size_t* pDataSize,
+ void* pData);
// Format capabilities
@@ -2579,8 +2579,8 @@
XGL_DEVICE device,
XGL_FORMAT format,
XGL_FORMAT_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ size_t* pDataSize,
+ void* pData);
// Buffer functions
@@ -2615,8 +2615,8 @@
XGL_IMAGE image,
const XGL_IMAGE_SUBRESOURCE* pSubresource,
XGL_SUBRESOURCE_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ size_t* pDataSize,
+ void* pData);
// Image view functions
@@ -2656,13 +2656,13 @@
XGL_RESULT XGLAPI xglStorePipeline(
XGL_PIPELINE pipeline,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
+ size_t* pDataSize,
+ void* pData);
XGL_RESULT XGLAPI xglLoadPipeline(
XGL_DEVICE device,
- XGL_SIZE dataSize,
- const XGL_VOID* pData,
+ size_t dataSize,
+ const void* pData,
XGL_PIPELINE* pPipeline);
XGL_RESULT XGLAPI xglCreatePipelineDelta(
@@ -2683,7 +2683,7 @@
XGL_RESULT XGLAPI xglCreateDescriptorSetLayout(
XGL_DEVICE device,
XGL_FLAGS stageFlags, // XGL_SHADER_STAGE_FLAGS
- const XGL_UINT* pSetBindPoints,
+ const uint32_t* pSetBindPoints,
XGL_DESCRIPTOR_SET_LAYOUT priorSetLayout,
const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pSetLayoutInfoList,
XGL_DESCRIPTOR_SET_LAYOUT* pSetLayout);
@@ -2699,7 +2699,7 @@
XGL_RESULT XGLAPI xglCreateDescriptorRegion(
XGL_DEVICE device,
XGL_DESCRIPTOR_REGION_USAGE regionUsage,
- XGL_UINT maxSets,
+ uint32_t maxSets,
const XGL_DESCRIPTOR_REGION_CREATE_INFO* pCreateInfo,
XGL_DESCRIPTOR_REGION* pDescriptorRegion);
@@ -2709,19 +2709,19 @@
XGL_RESULT XGLAPI xglAllocDescriptorSets(
XGL_DESCRIPTOR_REGION descriptorRegion,
XGL_DESCRIPTOR_SET_USAGE setUsage,
- XGL_UINT count,
+ uint32_t count,
const XGL_DESCRIPTOR_SET_LAYOUT* pSetLayouts,
XGL_DESCRIPTOR_SET* pDescriptorSets,
- XGL_UINT* pCount);
+ uint32_t* pCount);
-XGL_VOID XGLAPI xglClearDescriptorSets(
+void XGLAPI xglClearDescriptorSets(
XGL_DESCRIPTOR_REGION descriptorRegion,
- XGL_UINT count,
+ uint32_t count,
const XGL_DESCRIPTOR_SET* pDescriptorSets);
-XGL_VOID XGLAPI xglUpdateDescriptors(
+void XGLAPI xglUpdateDescriptors(
XGL_DESCRIPTOR_SET descriptorSet,
- const XGL_VOID* pUpdateChain);
+ const void* pUpdateChain);
// State object functions
@@ -2764,217 +2764,217 @@
// Command buffer building functions
-XGL_VOID XGLAPI xglCmdBindPipeline(
+void XGLAPI xglCmdBindPipeline(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
XGL_PIPELINE pipeline);
-XGL_VOID XGLAPI xglCmdBindPipelineDelta(
+void XGLAPI xglCmdBindPipelineDelta(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
XGL_PIPELINE_DELTA delta);
-XGL_VOID XGLAPI xglCmdBindDynamicStateObject(
+void XGLAPI xglCmdBindDynamicStateObject(
XGL_CMD_BUFFER cmdBuffer,
XGL_STATE_BIND_POINT stateBindPoint,
XGL_DYNAMIC_STATE_OBJECT dynamicState);
-XGL_VOID XGLAPI xglCmdBindDescriptorSet(
+void XGLAPI xglCmdBindDescriptorSet(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
XGL_DESCRIPTOR_SET descriptorSet,
- const XGL_UINT* pUserData);
+ const uint32_t* pUserData);
-XGL_VOID XGLAPI xglCmdBindVertexBuffer(
+void XGLAPI xglCmdBindVertexBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER buffer,
XGL_GPU_SIZE offset,
- XGL_UINT binding);
+ uint32_t binding);
-XGL_VOID XGLAPI xglCmdBindIndexBuffer(
+void XGLAPI xglCmdBindIndexBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER buffer,
XGL_GPU_SIZE offset,
XGL_INDEX_TYPE indexType);
-XGL_VOID XGLAPI xglCmdDraw(
+void XGLAPI xglCmdDraw(
XGL_CMD_BUFFER cmdBuffer,
- XGL_UINT firstVertex,
- XGL_UINT vertexCount,
- XGL_UINT firstInstance,
- XGL_UINT instanceCount);
+ uint32_t firstVertex,
+ uint32_t vertexCount,
+ uint32_t firstInstance,
+ uint32_t instanceCount);
-XGL_VOID XGLAPI xglCmdDrawIndexed(
+void XGLAPI xglCmdDrawIndexed(
XGL_CMD_BUFFER cmdBuffer,
- XGL_UINT firstIndex,
- XGL_UINT indexCount,
- XGL_INT vertexOffset,
- XGL_UINT firstInstance,
- XGL_UINT instanceCount);
+ uint32_t firstIndex,
+ uint32_t indexCount,
+ int32_t vertexOffset,
+ uint32_t firstInstance,
+ uint32_t instanceCount);
-XGL_VOID XGLAPI xglCmdDrawIndirect(
+void XGLAPI xglCmdDrawIndirect(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER buffer,
XGL_GPU_SIZE offset,
- XGL_UINT32 count,
- XGL_UINT32 stride);
+ uint32_t count,
+ uint32_t stride);
-XGL_VOID XGLAPI xglCmdDrawIndexedIndirect(
+void XGLAPI xglCmdDrawIndexedIndirect(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER buffer,
XGL_GPU_SIZE offset,
- XGL_UINT32 count,
- XGL_UINT32 stride);
+ uint32_t count,
+ uint32_t stride);
-XGL_VOID XGLAPI xglCmdDispatch(
+void XGLAPI xglCmdDispatch(
XGL_CMD_BUFFER cmdBuffer,
- XGL_UINT x,
- XGL_UINT y,
- XGL_UINT z);
+ uint32_t x,
+ uint32_t y,
+ uint32_t z);
-XGL_VOID XGLAPI xglCmdDispatchIndirect(
+void XGLAPI xglCmdDispatchIndirect(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER buffer,
XGL_GPU_SIZE offset);
-XGL_VOID XGLAPI xglCmdCopyBuffer(
+void XGLAPI xglCmdCopyBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER srcBuffer,
XGL_BUFFER destBuffer,
- XGL_UINT regionCount,
+ uint32_t regionCount,
const XGL_BUFFER_COPY* pRegions);
-XGL_VOID XGLAPI xglCmdCopyImage(
+void XGLAPI xglCmdCopyImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
XGL_IMAGE destImage,
- XGL_UINT regionCount,
+ uint32_t regionCount,
const XGL_IMAGE_COPY* pRegions);
-XGL_VOID XGLAPI xglCmdCopyBufferToImage(
+void XGLAPI xglCmdCopyBufferToImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER srcBuffer,
XGL_IMAGE destImage,
- XGL_UINT regionCount,
+ uint32_t regionCount,
const XGL_BUFFER_IMAGE_COPY* pRegions);
-XGL_VOID XGLAPI xglCmdCopyImageToBuffer(
+void XGLAPI xglCmdCopyImageToBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
XGL_BUFFER destBuffer,
- XGL_UINT regionCount,
+ uint32_t regionCount,
const XGL_BUFFER_IMAGE_COPY* pRegions);
-XGL_VOID XGLAPI xglCmdCloneImageData(
+void XGLAPI xglCmdCloneImageData(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
XGL_IMAGE_LAYOUT srcImageLayout,
XGL_IMAGE destImage,
XGL_IMAGE_LAYOUT destImageLayout);
-XGL_VOID XGLAPI xglCmdUpdateBuffer(
+void XGLAPI xglCmdUpdateBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER destBuffer,
XGL_GPU_SIZE destOffset,
XGL_GPU_SIZE dataSize,
- const XGL_UINT32* pData);
+ const uint32_t* pData);
-XGL_VOID XGLAPI xglCmdFillBuffer(
+void XGLAPI xglCmdFillBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER destBuffer,
XGL_GPU_SIZE destOffset,
XGL_GPU_SIZE fillSize,
- XGL_UINT32 data);
+ uint32_t data);
-XGL_VOID XGLAPI xglCmdClearColorImage(
+void XGLAPI xglCmdClearColorImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE image,
- const XGL_FLOAT color[4],
- XGL_UINT rangeCount,
+ const float color[4],
+ uint32_t rangeCount,
const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-XGL_VOID XGLAPI xglCmdClearColorImageRaw(
+void XGLAPI xglCmdClearColorImageRaw(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE image,
- const XGL_UINT32 color[4],
- XGL_UINT rangeCount,
+ const uint32_t color[4],
+ uint32_t rangeCount,
const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-XGL_VOID XGLAPI xglCmdClearDepthStencil(
+void XGLAPI xglCmdClearDepthStencil(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE image,
- XGL_FLOAT depth,
- XGL_UINT32 stencil,
- XGL_UINT rangeCount,
+ float depth,
+ uint32_t stencil,
+ uint32_t rangeCount,
const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges);
-XGL_VOID XGLAPI xglCmdResolveImage(
+void XGLAPI xglCmdResolveImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
XGL_IMAGE destImage,
- XGL_UINT rectCount,
+ uint32_t rectCount,
const XGL_IMAGE_RESOLVE* pRects);
-XGL_VOID XGLAPI xglCmdSetEvent(
+void XGLAPI xglCmdSetEvent(
XGL_CMD_BUFFER cmdBuffer,
XGL_EVENT event,
XGL_SET_EVENT pipeEvent);
-XGL_VOID XGLAPI xglCmdResetEvent(
+void XGLAPI xglCmdResetEvent(
XGL_CMD_BUFFER cmdBuffer,
XGL_EVENT event);
-XGL_VOID XGLAPI xglCmdWaitEvents(
+void XGLAPI xglCmdWaitEvents(
XGL_CMD_BUFFER cmdBuffer,
const XGL_EVENT_WAIT_INFO* pWaitInfo);
-XGL_VOID XGLAPI xglCmdPipelineBarrier(
+void XGLAPI xglCmdPipelineBarrier(
XGL_CMD_BUFFER cmdBuffer,
const XGL_PIPELINE_BARRIER* pBarrier);
-XGL_VOID XGLAPI xglCmdBeginQuery(
+void XGLAPI xglCmdBeginQuery(
XGL_CMD_BUFFER cmdBuffer,
XGL_QUERY_POOL queryPool,
- XGL_UINT slot,
+ uint32_t slot,
XGL_FLAGS flags);
-XGL_VOID XGLAPI xglCmdEndQuery(
+void XGLAPI xglCmdEndQuery(
XGL_CMD_BUFFER cmdBuffer,
XGL_QUERY_POOL queryPool,
- XGL_UINT slot);
+ uint32_t slot);
-XGL_VOID XGLAPI xglCmdResetQueryPool(
+void XGLAPI xglCmdResetQueryPool(
XGL_CMD_BUFFER cmdBuffer,
XGL_QUERY_POOL queryPool,
- XGL_UINT startQuery,
- XGL_UINT queryCount);
+ uint32_t startQuery,
+ uint32_t queryCount);
-XGL_VOID XGLAPI xglCmdWriteTimestamp(
+void XGLAPI xglCmdWriteTimestamp(
XGL_CMD_BUFFER cmdBuffer,
XGL_TIMESTAMP_TYPE timestampType,
XGL_BUFFER destBuffer,
XGL_GPU_SIZE destOffset);
-XGL_VOID XGLAPI xglCmdInitAtomicCounters(
+void XGLAPI xglCmdInitAtomicCounters(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
- XGL_UINT startCounter,
- XGL_UINT counterCount,
- const XGL_UINT32* pData);
+ uint32_t startCounter,
+ uint32_t counterCount,
+ const uint32_t* pData);
-XGL_VOID XGLAPI xglCmdLoadAtomicCounters(
+void XGLAPI xglCmdLoadAtomicCounters(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
- XGL_UINT startCounter,
- XGL_UINT counterCount,
+ uint32_t startCounter,
+ uint32_t counterCount,
XGL_BUFFER srcBuffer,
XGL_GPU_SIZE srcOffset);
-XGL_VOID XGLAPI xglCmdSaveAtomicCounters(
+void XGLAPI xglCmdSaveAtomicCounters(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint,
- XGL_UINT startCounter,
- XGL_UINT counterCount,
+ uint32_t startCounter,
+ uint32_t counterCount,
XGL_BUFFER destBuffer,
XGL_GPU_SIZE destOffset);
@@ -3017,7 +3017,7 @@
typedef struct _XGL_XFB_CREATE_INFO
{
XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_XFB_CREATE_INFO
- const XGL_VOID* pNext; // Pointer to next structure
+ const void* pNext; // Pointer to next structure
// More XFB state, if any goes here
} XGL_DEPTH_STENCIL_VIEW_CREATE_INFO;
@@ -3029,7 +3029,7 @@
xglCmdBindTransformFeedbackBufferView(
XGL_CMD_BUFFER cmdBuffer,
XGL_PIPELINE_BIND_POINT pipelineBindPoint, // = GRAPHICS
- XGL_UINT index,
+ uint32_t index,
const XGL_BUFFER_VIEW_ATTACH_INFO* pBufferView);
2) "Bindless" + support for non-bindless hardware.
diff --git a/include/xglDbg.h b/include/xglDbg.h
index 75caca2..b040710 100644
--- a/include/xglDbg.h
+++ b/include/xglDbg.h
@@ -97,25 +97,25 @@
XGL_NUM_DBG_OBJECT_TYPE = (XGL_DBG_OBJECT_TYPE_END_RANGE - XGL_DBG_OBJECT_TYPE_BEGIN_RANGE + 1),
} XGL_DBG_OBJECT_TYPE;
-typedef XGL_VOID (XGLAPI *XGL_DBG_MSG_CALLBACK_FUNCTION)(
+typedef void (XGLAPI *XGL_DBG_MSG_CALLBACK_FUNCTION)(
XGL_DBG_MSG_TYPE msgType,
XGL_VALIDATION_LEVEL validationLevel,
XGL_BASE_OBJECT srcObject,
- XGL_SIZE location,
- XGL_INT msgCode,
- const XGL_CHAR* pMsg,
- XGL_VOID* pUserData);
+ size_t location,
+ int32_t msgCode,
+ const char* pMsg,
+ void* pUserData);
// Debug functions
typedef XGL_RESULT (XGLAPI *xglDbgSetValidationLevelType)(XGL_DEVICE device, XGL_VALIDATION_LEVEL validationLevel);
-typedef XGL_RESULT (XGLAPI *xglDbgRegisterMsgCallbackType)(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData);
+typedef XGL_RESULT (XGLAPI *xglDbgRegisterMsgCallbackType)(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData);
typedef XGL_RESULT (XGLAPI *xglDbgUnregisterMsgCallbackType)(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback);
-typedef XGL_RESULT (XGLAPI *xglDbgSetMessageFilterType)(XGL_DEVICE device, XGL_INT msgCode, XGL_DBG_MSG_FILTER filter);
-typedef XGL_RESULT (XGLAPI *xglDbgSetObjectTagType)(XGL_BASE_OBJECT object, XGL_SIZE tagSize, const XGL_VOID* pTag);
-typedef XGL_RESULT (XGLAPI *xglDbgSetGlobalOptionType)(XGL_DBG_GLOBAL_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData);
-typedef XGL_RESULT (XGLAPI *xglDbgSetDeviceOptionType)(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData);
-typedef XGL_VOID (XGLAPI *xglCmdDbgMarkerBeginType)(XGL_CMD_BUFFER cmdBuffer, const XGL_CHAR* pMarker);
-typedef XGL_VOID (XGLAPI *xglCmdDbgMarkerEndType)(XGL_CMD_BUFFER cmdBuffer);
+typedef XGL_RESULT (XGLAPI *xglDbgSetMessageFilterType)(XGL_DEVICE device, int32_t msgCode, XGL_DBG_MSG_FILTER filter);
+typedef XGL_RESULT (XGLAPI *xglDbgSetObjectTagType)(XGL_BASE_OBJECT object, size_t tagSize, const void* pTag);
+typedef XGL_RESULT (XGLAPI *xglDbgSetGlobalOptionType)(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData);
+typedef XGL_RESULT (XGLAPI *xglDbgSetDeviceOptionType)(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, size_t dataSize, const void* pData);
+typedef void (XGLAPI *xglCmdDbgMarkerBeginType)(XGL_CMD_BUFFER cmdBuffer, const char* pMarker);
+typedef void (XGLAPI *xglCmdDbgMarkerEndType)(XGL_CMD_BUFFER cmdBuffer);
XGL_RESULT XGLAPI xglDbgSetValidationLevel(
XGL_DEVICE device,
@@ -123,37 +123,37 @@
XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(
XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback,
- XGL_VOID* pUserData);
+ void* pUserData);
XGL_RESULT XGLAPI xglDbgUnregisterMsgCallback(
XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback);
XGL_RESULT XGLAPI xglDbgSetMessageFilter(
XGL_DEVICE device,
- XGL_INT msgCode,
+ int32_t msgCode,
XGL_DBG_MSG_FILTER filter);
XGL_RESULT XGLAPI xglDbgSetObjectTag(
XGL_BASE_OBJECT object,
- XGL_SIZE tagSize,
- const XGL_VOID* pTag);
+ size_t tagSize,
+ const void* pTag);
XGL_RESULT XGLAPI xglDbgSetGlobalOption(
XGL_DBG_GLOBAL_OPTION dbgOption,
- XGL_SIZE dataSize,
- const XGL_VOID* pData);
+ size_t dataSize,
+ const void* pData);
XGL_RESULT XGLAPI xglDbgSetDeviceOption(
XGL_DEVICE device,
XGL_DBG_DEVICE_OPTION dbgOption,
- XGL_SIZE dataSize,
- const XGL_VOID* pData);
+ size_t dataSize,
+ const void* pData);
-XGL_VOID XGLAPI xglCmdDbgMarkerBegin(
+void XGLAPI xglCmdDbgMarkerBegin(
XGL_CMD_BUFFER cmdBuffer,
- const XGL_CHAR* pMarker);
+ const char* pMarker);
-XGL_VOID XGLAPI xglCmdDbgMarkerEnd(
+void XGLAPI xglCmdDbgMarkerEnd(
XGL_CMD_BUFFER cmdBuffer);
#ifdef __cplusplus
diff --git a/include/xglLayer.h b/include/xglLayer.h
index 195de53..5654da0 100644
--- a/include/xglLayer.h
+++ b/include/xglLayer.h
@@ -153,7 +153,7 @@
typedef struct _XGL_LAYER_DBG_FUNCTION_NODE
{
XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback;
- XGL_VOID *pUserData;
+ void *pUserData;
struct _XGL_LAYER_DBG_FUNCTION_NODE *pNext;
} XGL_LAYER_DBG_FUNCTION_NODE;
diff --git a/include/xglPlatform.h b/include/xglPlatform.h
index 19e52db..f0c7a3f 100644
--- a/include/xglPlatform.h
+++ b/include/xglPlatform.h
@@ -51,52 +51,14 @@
#endif
#include <stddef.h>
-
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
-
-/*
- * Using <stdint.h>
- */
#include <stdint.h>
-typedef int8_t XGL_INT8;
-typedef uint8_t XGL_UINT8;
-typedef int16_t XGL_INT16;
-typedef uint16_t XGL_UINT16;
-typedef int32_t XGL_INT32;
-typedef uint32_t XGL_UINT32;
-typedef int64_t XGL_INT64;
-typedef uint64_t XGL_UINT64;
-#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+typedef uint64_t XGL_GPU_SIZE;
+typedef uint32_t bool32_t;
-/*
- * Win32
- */
-typedef signed __int8 XGL_INT8;
-typedef unsigned __int8 XGL_UINT8;
-typedef signed __int16 XGL_INT16;
-typedef unsigned __int16 XGL_UINT16;
-typedef signed __int32 XGL_INT32;
-typedef unsigned __int32 XGL_UINT32;
-typedef signed __int64 XGL_INT64;
-typedef unsigned __int64 XGL_UINT64;
-
-#endif
-
-typedef size_t XGL_SIZE;
-typedef XGL_UINT64 XGL_GPU_SIZE;
-typedef XGL_UINT8 XGL_BYTE;
-typedef XGL_INT32 XGL_INT;
-typedef XGL_UINT32 XGL_UINT;
-typedef char XGL_CHAR;
-typedef float XGL_FLOAT;
-typedef double XGL_DOUBLE;
-typedef XGL_UINT32 XGL_BOOL;
-typedef void XGL_VOID;
-
-typedef XGL_UINT32 XGL_SAMPLE_MASK;
-typedef XGL_UINT32 XGL_FLAGS;
-typedef XGL_INT32 XGL_ENUM;
+typedef uint32_t XGL_SAMPLE_MASK;
+typedef uint32_t XGL_FLAGS;
+typedef int32_t XGL_ENUM;
#ifdef __cplusplus
} // extern "C"
diff --git a/include/xglWsiX11Ext.h b/include/xglWsiX11Ext.h
index d475255..479aba7 100644
--- a/include/xglWsiX11Ext.h
+++ b/include/xglWsiX11Ext.h
@@ -57,9 +57,9 @@
* on \p destWindow.
*/
xcb_randr_crtc_t crtc;
- XGL_UINT64 target_msc;
- XGL_UINT64 divisor;
- XGL_UINT64 remainder;
+ uint64_t target_msc;
+ uint64_t divisor;
+ uint64_t remainder;
/**
* After waiting for the current and target MSCs to match, the
@@ -67,7 +67,7 @@
* next time current MSC is incremented. When \p async is true, it will
* occur as soon as possible.
*/
- XGL_BOOL async;
+ bool32_t async;
/**
* When \p flip is false, the contents of \p srcImage are copied to
@@ -77,11 +77,11 @@
* An error may be returned if \p flip is true but \p destWindow can not
* be flipped to.
*/
- XGL_BOOL flip;
+ bool32_t flip;
} XGL_WSI_X11_PRESENT_INFO;
typedef XGL_RESULT (XGLAPI *xglWsiX11AssociateConnectionType)(XGL_PHYSICAL_GPU gpu, const XGL_WSI_X11_CONNECTION_INFO* pConnectionInfo);
-typedef XGL_RESULT (XGLAPI *xglWsiX11GetMSCType)(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, XGL_UINT64* pMsc);
+typedef XGL_RESULT (XGLAPI *xglWsiX11GetMSCType)(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, uint64_t* pMsc);
typedef XGL_RESULT (XGLAPI *xglWsiX11CreatePresentableImageType)(XGL_DEVICE device, const XGL_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO* pCreateInfo, XGL_IMAGE* pImage, XGL_GPU_MEMORY* pMem);
typedef XGL_RESULT (XGLAPI *xglWsiX11QueuePresentType)(XGL_QUEUE queue, const XGL_WSI_X11_PRESENT_INFO* pPresentInfo, XGL_FENCE fence);
@@ -110,7 +110,7 @@
XGL_DEVICE device,
xcb_window_t window,
xcb_randr_crtc_t crtc,
- XGL_UINT64* pMsc);
+ uint64_t* pMsc);
/**
* Create an XGL_IMAGE that can be presented. An XGL_GPU_MEMORY is created
diff --git a/layers/basic.cpp b/layers/basic.cpp
index 5b2bb58..ebbc45b 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -28,7 +28,7 @@
#include "xgl_dispatch_table_helper.h"
#include "xglLayer.h"
-static std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *> tableMap;
+static std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *> tableMap;
static XGL_LAYER_DISPATCH_TABLE * initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw)
{
@@ -36,11 +36,11 @@
XGL_LAYER_DISPATCH_TABLE *pTable;
assert(gpuw);
- std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap.find((XGL_VOID *) gpuw);
+ std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap.find((void *) gpuw);
if (it == tableMap.end())
{
pTable = new XGL_LAYER_DISPATCH_TABLE;
- tableMap[(XGL_VOID *) gpuw] = pTable;
+ tableMap[(void *) gpuw] = pTable;
} else
{
return it->second;
@@ -58,7 +58,7 @@
return XGL_SUCCESS;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pExtName)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const char* pExtName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
XGL_RESULT result;
@@ -85,7 +85,7 @@
printf("Completed wrapped xglCreateDevice() call w/ pDevice, Device %p: %p\n", (void*)pDevice, (void *) *pDevice);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_LAYER_DISPATCH_TABLE* pTable = tableMap[device];
@@ -95,7 +95,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved)
{
if (gpu != NULL)
{
@@ -114,7 +114,7 @@
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT*) pReserved;
xglGetGpuInfoType fpGetGpuInfo;
XGL_PHYSICAL_GPU_PROPERTIES gpuProps;
- XGL_SIZE dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);
+ size_t dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);
fpGetGpuInfo = (xglGetGpuInfoType) gpuw->pGPA((XGL_PHYSICAL_GPU) gpuw->nextObject, "xglGetGpuInfo");
fpGetGpuInfo((XGL_PHYSICAL_GPU) gpuw->nextObject, XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES, &dataSize, &gpuProps);
if (gpuProps.vendorId == 0x8086)
@@ -129,7 +129,7 @@
}
}
-XGL_LAYER_EXPORT XGL_VOID * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName)
+XGL_LAYER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* pName)
{
if (gpu == NULL)
return NULL;
@@ -137,17 +137,17 @@
initLayerTable((const XGL_BASE_LAYER_OBJECT *) gpu);
if (!strncmp("xglGetProcAddr", pName, sizeof("xglGetProcAddr")))
- return (XGL_VOID *) xglGetProcAddr;
+ return (void *) xglGetProcAddr;
else if (!strncmp("xglCreateDevice", pName, sizeof ("xglCreateDevice")))
- return (XGL_VOID *) xglCreateDevice;
+ return (void *) xglCreateDevice;
else if (!strncmp("xglGetExtensionSupport", pName, sizeof ("xglGetExtensionSupport")))
- return (XGL_VOID *) xglGetExtensionSupport;
+ return (void *) xglGetExtensionSupport;
else if (!strncmp("xglEnumerateLayers", pName, sizeof ("xglEnumerateLayers")))
- return (XGL_VOID *) xglEnumerateLayers;
+ return (void *) xglEnumerateLayers;
else if (!strncmp("xglGetFormatInfo", pName, sizeof ("xglGetFormatInfo")))
- return (XGL_VOID *) xglGetFormatInfo;
+ return (void *) xglGetFormatInfo;
else if (!strncmp("xglLayerExtension1", pName, sizeof("xglLayerExtension1")))
- return (XGL_VOID *) xglLayerExtension1;
+ return (void *) xglLayerExtension1;
else {
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
if (gpuw->pGPA == NULL)
diff --git a/layers/draw_state.c b/layers/draw_state.c
index 8ce0968..47f85cd 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -49,11 +49,11 @@
// Utility function to handle reporting
// If callbacks are enabled, use them, otherwise use printf
-static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType,
+static void layerCbMsg(XGL_DBG_MSG_TYPE msgType,
XGL_VALIDATION_LEVEL validationLevel,
XGL_BASE_OBJECT srcObject,
- XGL_SIZE location,
- XGL_INT msgCode,
+ size_t location,
+ int32_t msgCode,
const char* pLayerPrefix,
const char* pMsg)
{
@@ -108,7 +108,7 @@
}
}
// Return the size of the underlying struct based on struct type
-static XGL_SIZE sTypeStructSize(XGL_STRUCTURE_TYPE sType)
+static size_t sTypeStructSize(XGL_STRUCTURE_TYPE sType)
{
switch (sType)
{
@@ -188,7 +188,7 @@
}
// Return the size of the underlying struct based on Bind Point enum
// Have to do this b/c VIEWPORT doesn't have sType in its createinfo struct
-static XGL_SIZE dynStateCreateInfoSize(XGL_STATE_BIND_POINT sType)
+static size_t dynStateCreateInfoSize(XGL_STATE_BIND_POINT sType)
{
switch (sType)
{
@@ -214,13 +214,13 @@
static uint64_t drawCount[NUM_DRAW_TYPES] = {0, 0, 0, 0};
typedef struct _SHADER_DS_MAPPING {
- XGL_UINT slotCount;
+ uint32_t slotCount;
XGL_DESCRIPTOR_SLOT_INFO* pShaderMappingSlot;
} SHADER_DS_MAPPING;
typedef struct _PIPELINE_LL_HEADER {
XGL_STRUCTURE_TYPE sType;
- const XGL_VOID* pNext;
+ const void* pNext;
} PIPELINE_LL_HEADER;
typedef struct _PIPELINE_NODE {
@@ -230,9 +230,9 @@
// 1st dimension of array is shader type
SHADER_DS_MAPPING dsMapping[XGL_NUM_GRAPHICS_SHADERS][XGL_MAX_DESCRIPTOR_SETS];
// Vtx input info (if any)
- XGL_UINT vtxBindingCount; // number of bindings
+ uint32_t vtxBindingCount; // number of bindings
XGL_VERTEX_INPUT_BINDING_DESCRIPTION* pVertexBindingDescriptions;
- XGL_UINT vtxAttributeCount; // number of attributes
+ uint32_t vtxAttributeCount; // number of attributes
XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION* pVertexAttributeDescriptions;
} PIPELINE_NODE;
@@ -256,7 +256,7 @@
static SAMPLER_NODE *pSamplerHead = NULL;
static XGL_PIPELINE lastBoundPipeline = NULL;
#define MAX_BINDING 0xFFFFFFFF
-static XGL_UINT lastVtxBinding = MAX_BINDING;
+static uint32_t lastVtxBinding = MAX_BINDING;
static DYNAMIC_STATE_NODE* pDynamicStateHead[XGL_NUM_STATE_BIND_POINT] = {0};
static DYNAMIC_STATE_NODE* pLastBoundDynamicState[XGL_NUM_STATE_BIND_POINT] = {0};
@@ -410,7 +410,7 @@
#define MAPPING_SAMPLER 0x00000004
#define MAPPING_DS 0x00000008
-static char* stringSlotBinding(XGL_UINT binding)
+static char* stringSlotBinding(uint32_t binding)
{
switch (binding)
{
@@ -426,11 +426,11 @@
}
typedef struct _DS_SLOT {
- XGL_UINT slot;
+ uint32_t slot;
XGL_DESCRIPTOR_SLOT_INFO shaderSlotInfo[XGL_NUM_GRAPHICS_SHADERS];
// Only 1 of 4 possible slot mappings active
- XGL_UINT activeMapping;
- XGL_UINT mappingMask; // store record of different mappings used
+ uint32_t activeMapping;
+ uint32_t mappingMask; // store record of different mappings used
XGL_MEMORY_VIEW_ATTACH_INFO memView;
XGL_IMAGE_VIEW_ATTACH_INFO imageView;
XGL_SAMPLER sampler;
@@ -439,17 +439,17 @@
// Top-level node that points to start of DS
typedef struct _DS_LL_HEAD {
XGL_DESCRIPTOR_SET dsID;
- XGL_UINT numSlots;
+ uint32_t numSlots;
struct _DS_LL_HEAD *pNextDS;
DS_SLOT *dsSlot; // Dynamically allocated array of DS_SLOTs
- XGL_BOOL updateActive; // Track if DS is in an update block
+ bool32_t updateActive; // Track if DS is in an update block
} DS_LL_HEAD;
// ptr to HEAD of LL of DSs
static DS_LL_HEAD *pDSHead = NULL;
// Last DS that was bound, and slotOffset for the binding
static XGL_DESCRIPTOR_SET lastBoundDS[XGL_MAX_DESCRIPTOR_SETS] = {NULL, NULL};
-static XGL_UINT lastBoundSlotOffset[XGL_MAX_DESCRIPTOR_SETS] = {0, 0};
+static uint32_t lastBoundSlotOffset[XGL_MAX_DESCRIPTOR_SETS] = {0, 0};
// Return DS Head ptr for specified ds or else NULL
static DS_LL_HEAD* getDS(XGL_DESCRIPTOR_SET ds)
@@ -477,7 +477,7 @@
}
// Return XGL_TRUE if DS Exists and is within an xglBeginDescriptorSetUpdate() call sequence, otherwise XGL_FALSE
-static XGL_BOOL dsUpdate(XGL_DESCRIPTOR_SET ds)
+static bool32_t dsUpdate(XGL_DESCRIPTOR_SET ds)
{
DS_LL_HEAD *pTrav = getDS(ds);
if (pTrav)
@@ -487,7 +487,7 @@
// Clear specified slotCount DS Slots starting at startSlot
// Return XGL_TRUE if DS exists and is successfully cleared to 0s
-static XGL_BOOL clearDS(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount)
+static bool32_t clearDS(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount)
{
DS_LL_HEAD *pTrav = getDS(descriptorSet);
pthread_mutex_lock(&globalLock);
@@ -503,13 +503,13 @@
return XGL_TRUE;
}
-static void dsSetMapping(DS_SLOT* pSlot, XGL_UINT mapping)
+static void dsSetMapping(DS_SLOT* pSlot, uint32_t mapping)
{
pSlot->mappingMask |= mapping;
pSlot->activeMapping = mapping;
}
// Populate pStr w/ a string noting all of the slot mappings based on mapping flag
-static char* noteSlotMapping(XGL_UINT32 mapping, char *pStr)
+static char* noteSlotMapping(uint32_t mapping, char *pStr)
{
if (MAPPING_MEMORY & mapping)
strcat(pStr, "\n\tMemory View previously mapped");
@@ -534,7 +534,7 @@
dsSetMapping(pSlot, MAPPING_MEMORY);
}
-static XGL_BOOL dsMemMapping(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
+static bool32_t dsMemMapping(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
{
DS_LL_HEAD *pTrav = getDS(descriptorSet);
if (pTrav) {
@@ -562,7 +562,7 @@
dsSetMapping(pSlot, MAPPING_IMAGE);
}
-static XGL_BOOL dsImageMapping(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
+static bool32_t dsImageMapping(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
{
DS_LL_HEAD *pTrav = getDS(descriptorSet);
if (pTrav) {
@@ -590,7 +590,7 @@
dsSetMapping(pSlot, MAPPING_SAMPLER);
}
-static XGL_BOOL dsSamplerMapping(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_SAMPLER* pSamplers)
+static bool32_t dsSamplerMapping(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_SAMPLER* pSamplers)
{
DS_LL_HEAD *pTrav = getDS(descriptorSet);
if (pTrav) {
@@ -741,7 +741,7 @@
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NO_DS_BOUND, "DS", str);
}
else { // We have a good DS & Pipeline, store pipeline mappings in DS
- XGL_UINT slotOffset = lastBoundSlotOffset[i];
+ uint32_t slotOffset = lastBoundSlotOffset[i];
for (uint32_t j = 0; j < XGL_NUM_GRAPHICS_SHADERS; j++) { // j is shader selector
if (pPipeTrav->dsMapping[j][i].slotCount > (pDS->numSlots - slotOffset)) {
sprintf(str, "DS Mapping for shader %u has more slots (%u) than DS %p (%u) minus slotOffset (%u) (%u slots available)!", j, pPipeTrav->dsMapping[j][i].slotCount, (void*)pDS->dsID, pDS->numSlots, slotOffset, (pDS->numSlots - slotOffset));
@@ -788,9 +788,9 @@
// Checks to make sure that shader mapping matches slot binding
// Print an ERROR and return XGL_FALSE if they don't line up
-static XGL_BOOL verifyShaderSlotMapping(const XGL_UINT slot, const XGL_UINT slotBinding, const XGL_UINT shaderStage, const XGL_DESCRIPTOR_SET_SLOT_TYPE shaderMapping)
+static bool32_t verifyShaderSlotMapping(const uint32_t slot, const uint32_t slotBinding, const uint32_t shaderStage, const XGL_DESCRIPTOR_SET_SLOT_TYPE shaderMapping)
{
- XGL_BOOL error = XGL_FALSE;
+ bool32_t error = XGL_FALSE;
char str[1024];
switch (shaderMapping)
{
@@ -835,7 +835,7 @@
for (uint32_t i = 0; i < XGL_MAX_DESCRIPTOR_SETS; i++) {
if (lastBoundDS[i]) {
DS_LL_HEAD *pDS = getDS(lastBoundDS[i]);
- XGL_UINT slotOffset = lastBoundSlotOffset[i];
+ uint32_t slotOffset = lastBoundSlotOffset[i];
if (pDS) {
sprintf(tmp_str, "DS INFO : Slot bindings for DS[%u] (%p) - %u slots and slotOffset %u:\n", i, (void*)pDS->dsID, pDS->numSlots, slotOffset);
strcat(ds_config_str, tmp_str);
@@ -950,12 +950,12 @@
layer_initialize_dispatch_table(&nextTable, fpNextGPA, (XGL_PHYSICAL_GPU) pCurObj->nextObject);
- xglGetProcAddrType fpGetProcAddr = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (XGL_CHAR *) "xglGetProcAddr");
+ xglGetProcAddrType fpGetProcAddr = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (char *) "xglGetProcAddr");
nextTable.GetProcAddr = fpGetProcAddr;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetGpuInfo(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetGpuInfo(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
pCurObj = gpuw;
@@ -979,7 +979,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pExtName)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const char* pExtName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
pCurObj = gpuw;
@@ -988,7 +988,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved)
{
if (gpu != NULL)
{
@@ -1008,19 +1008,19 @@
}
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, XGL_UINT queueIndex, XGL_QUEUE* pQueue)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, uint32_t queueIndex, XGL_QUEUE* pQueue)
{
XGL_RESULT result = nextTable.GetDeviceQueue(device, queueType, queueIndex, pQueue);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit(XGL_QUEUE queue, XGL_UINT cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit(XGL_QUEUE queue, uint32_t cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence)
{
XGL_RESULT result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, memRefCount, pMemRefs, fence);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSetGlobalMemReferences(XGL_QUEUE queue, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSetGlobalMemReferences(XGL_QUEUE queue, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs)
{
XGL_RESULT result = nextTable.QueueSetGlobalMemReferences(queue, memRefCount, pMemRefs);
return result;
@@ -1056,7 +1056,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglMapMemory(XGL_GPU_MEMORY mem, XGL_FLAGS flags, XGL_VOID** ppData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglMapMemory(XGL_GPU_MEMORY mem, XGL_FLAGS flags, void** ppData)
{
XGL_RESULT result = nextTable.MapMemory(mem, flags, ppData);
return result;
@@ -1068,13 +1068,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglPinSystemMemory(XGL_DEVICE device, const XGL_VOID* pSysMem, XGL_SIZE memSize, XGL_GPU_MEMORY* pMem)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglPinSystemMemory(XGL_DEVICE device, const void* pSysMem, size_t memSize, XGL_GPU_MEMORY* pMem)
{
XGL_RESULT result = nextTable.PinSystemMemory(device, pSysMem, memSize, pMem);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglRemapVirtualMemoryPages(XGL_DEVICE device, XGL_UINT rangeCount, const XGL_VIRTUAL_MEMORY_REMAP_RANGE* pRanges, XGL_UINT preWaitSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPreWaitSemaphores, XGL_UINT postSignalSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPostSignalSemaphores)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglRemapVirtualMemoryPages(XGL_DEVICE device, uint32_t rangeCount, const XGL_VIRTUAL_MEMORY_REMAP_RANGE* pRanges, uint32_t preWaitSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPreWaitSemaphores, uint32_t postSignalSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPostSignalSemaphores)
{
XGL_RESULT result = nextTable.RemapVirtualMemoryPages(device, rangeCount, pRanges, preWaitSemaphoreCount, pPreWaitSemaphores, postSignalSemaphoreCount, pPostSignalSemaphores);
return result;
@@ -1119,13 +1119,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetObjectInfo(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetObjectInfo(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetObjectInfo(object, infoType, pDataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, XGL_UINT allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, uint32_t allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
{
XGL_RESULT result = nextTable.BindObjectMemory(object, allocationIdx, mem, offset);
return result;
@@ -1143,7 +1143,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, XGL_UINT fenceCount, const XGL_FENCE* pFences, XGL_BOOL waitAll, XGL_UINT64 timeout)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, uint32_t fenceCount, const XGL_FENCE* pFences, bool32_t waitAll, uint64_t timeout)
{
XGL_RESULT result = nextTable.WaitForFences(device, fenceCount, pFences, waitAll, timeout);
return result;
@@ -1197,13 +1197,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetQueryPoolResults(XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetQueryPoolResults(XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetQueryPoolResults(queryPool, startQuery, queryCount, pDataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetFormatInfo(device, format, infoType, pDataSize, pData);
return result;
@@ -1215,7 +1215,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetImageSubresourceInfo(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetImageSubresourceInfo(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetImageSubresourceInfo(image, pSubresource, infoType, pDataSize, pData);
return result;
@@ -1277,13 +1277,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglStorePipeline(XGL_PIPELINE pipeline, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglStorePipeline(XGL_PIPELINE pipeline, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.StorePipeline(pipeline, pDataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglLoadPipeline(XGL_DEVICE device, XGL_SIZE dataSize, const XGL_VOID* pData, XGL_PIPELINE* pPipeline)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglLoadPipeline(XGL_DEVICE device, size_t dataSize, const void* pData, XGL_PIPELINE* pPipeline)
{
XGL_RESULT result = nextTable.LoadPipeline(device, dataSize, pData, pPipeline);
return result;
@@ -1338,7 +1338,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglBeginDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
+XGL_LAYER_EXPORT void XGLAPI xglBeginDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
{
DS_LL_HEAD* pDS = getDS(descriptorSet);
if (!pDS) {
@@ -1353,7 +1353,7 @@
nextTable.BeginDescriptorSetUpdate(descriptorSet);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglEndDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
+XGL_LAYER_EXPORT void XGLAPI xglEndDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1375,7 +1375,7 @@
nextTable.EndDescriptorSetUpdate(descriptorSet);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachSamplerDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_SAMPLER* pSamplers)
+XGL_LAYER_EXPORT void XGLAPI xglAttachSamplerDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_SAMPLER* pSamplers)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1393,7 +1393,7 @@
nextTable.AttachSamplerDescriptors(descriptorSet, startSlot, slotCount, pSamplers);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachImageViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
+XGL_LAYER_EXPORT void XGLAPI xglAttachImageViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1411,7 +1411,7 @@
nextTable.AttachImageViewDescriptors(descriptorSet, startSlot, slotCount, pImageViews);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachMemoryViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
+XGL_LAYER_EXPORT void XGLAPI xglAttachMemoryViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1429,7 +1429,7 @@
nextTable.AttachMemoryViewDescriptors(descriptorSet, startSlot, slotCount, pMemViews);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachNestedDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_DESCRIPTOR_SET_ATTACH_INFO* pNestedDescriptorSets)
+XGL_LAYER_EXPORT void XGLAPI xglAttachNestedDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_DESCRIPTOR_SET_ATTACH_INFO* pNestedDescriptorSets)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1441,7 +1441,7 @@
}
// TODO : Does xglBeginDescriptorSetUpdate() have to be called before this function?
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglClearDescriptorSetSlots(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount)
+XGL_LAYER_EXPORT void XGLAPI xglClearDescriptorSetSlots(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount)
{
if (!dsUpdate(descriptorSet)) {
// TODO : This is where we should flag a REAL error
@@ -1517,7 +1517,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline)
{
if (getPipeline(pipeline)) {
lastBoundPipeline = pipeline;
@@ -1530,18 +1530,18 @@
nextTable.CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindPipelineDelta(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipelineDelta(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta)
{
nextTable.CmdBindPipelineDelta(cmdBuffer, pipelineBindPoint, delta);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindStateObject(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_STATE_OBJECT state)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindStateObject(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_STATE_OBJECT state)
{
setLastBoundDynamicState(state, stateBindPoint);
nextTable.CmdBindStateObject(cmdBuffer, stateBindPoint, state);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT index, XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT slotOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t index, XGL_DESCRIPTOR_SET descriptorSet, uint32_t slotOffset)
{
if (getDS(descriptorSet)) {
assert(index < XGL_MAX_DESCRIPTOR_SETS);
@@ -1566,33 +1566,33 @@
nextTable.CmdBindDescriptorSet(cmdBuffer, pipelineBindPoint, index, descriptorSet, slotOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindDynamicMemoryView(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemView)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindDynamicMemoryView(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemView)
{
nextTable.CmdBindDynamicMemoryView(cmdBuffer, pipelineBindPoint, pMemView);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindVertexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT binding)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindVertexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t binding)
{
lastVtxBinding = binding;
nextTable.CmdBindVertexData(cmdBuffer, mem, offset, binding);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindIndexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindIndexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
{
nextTable.CmdBindIndexData(cmdBuffer, mem, offset, indexType);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPrepareMemoryRegions(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_MEMORY_STATE_TRANSITION* pStateTransitions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPrepareMemoryRegions(XGL_CMD_BUFFER cmdBuffer, uint32_t transitionCount, const XGL_MEMORY_STATE_TRANSITION* pStateTransitions)
{
nextTable.CmdPrepareMemoryRegions(cmdBuffer, transitionCount, pStateTransitions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPrepareImages(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_IMAGE_STATE_TRANSITION* pStateTransitions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPrepareImages(XGL_CMD_BUFFER cmdBuffer, uint32_t transitionCount, const XGL_IMAGE_STATE_TRANSITION* pStateTransitions)
{
nextTable.CmdPrepareImages(cmdBuffer, transitionCount, pStateTransitions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDraw(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDraw(XGL_CMD_BUFFER cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
{
char str[1024];
sprintf(str, "xglCmdDraw() call #%lu, reporting DS state:", drawCount[DRAW]++);
@@ -1601,7 +1601,7 @@
nextTable.CmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndexed(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstIndex, XGL_UINT indexCount, XGL_INT vertexOffset, XGL_UINT firstInstance, XGL_UINT instanceCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexed(XGL_CMD_BUFFER cmdBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount)
{
char str[1024];
sprintf(str, "xglCmdDrawIndexed() call #%lu, reporting DS state:", drawCount[DRAW_INDEXED]++);
@@ -1610,7 +1610,7 @@
nextTable.CmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
{
char str[1024];
sprintf(str, "xglCmdDrawIndirect() call #%lu, reporting DS state:", drawCount[DRAW_INDIRECT]++);
@@ -1619,7 +1619,7 @@
nextTable.CmdDrawIndirect(cmdBuffer, mem, offset, count, stride);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndexedIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexedIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
{
char str[1024];
sprintf(str, "xglCmdDrawIndexedIndirect() call #%lu, reporting DS state:", drawCount[DRAW_INDEXED_INDIRECT]++);
@@ -1628,127 +1628,127 @@
nextTable.CmdDrawIndexedIndirect(cmdBuffer, mem, offset, count, stride);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDispatch(XGL_CMD_BUFFER cmdBuffer, XGL_UINT x, XGL_UINT y, XGL_UINT z)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDispatch(XGL_CMD_BUFFER cmdBuffer, uint32_t x, uint32_t y, uint32_t z)
{
nextTable.CmdDispatch(cmdBuffer, x, y, z);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
{
nextTable.CmdDispatchIndirect(cmdBuffer, mem, offset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_GPU_MEMORY destMem, XGL_UINT regionCount, const XGL_MEMORY_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_GPU_MEMORY destMem, uint32_t regionCount, const XGL_MEMORY_COPY* pRegions)
{
nextTable.CmdCopyMemory(cmdBuffer, srcMem, destMem, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t regionCount, const XGL_IMAGE_COPY* pRegions)
{
nextTable.CmdCopyImage(cmdBuffer, srcImage, destImage, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyMemoryToImage(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyMemoryToImage(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_IMAGE destImage, uint32_t regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
{
nextTable.CmdCopyMemoryToImage(cmdBuffer, srcMem, destImage, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyImageToMemory(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_GPU_MEMORY destMem, XGL_UINT regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImageToMemory(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_GPU_MEMORY destMem, uint32_t regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
{
nextTable.CmdCopyImageToMemory(cmdBuffer, srcImage, destMem, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCloneImageData(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCloneImageData(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout)
{
nextTable.CmdCloneImageData(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdUpdateMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const XGL_UINT32* pData)
+XGL_LAYER_EXPORT void XGLAPI xglCmdUpdateMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const uint32_t* pData)
{
nextTable.CmdUpdateMemory(cmdBuffer, destMem, destOffset, dataSize, pData);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdFillMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, XGL_UINT32 data)
+XGL_LAYER_EXPORT void XGLAPI xglCmdFillMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, uint32_t data)
{
nextTable.CmdFillMemory(cmdBuffer, destMem, destOffset, fillSize, data);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_FLOAT color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_UINT32 color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_FLOAT depth, XGL_UINT32 stencil, XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
nextTable.CmdClearDepthStencil(cmdBuffer, image, depth, stencil, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResolveImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT rectCount, const XGL_IMAGE_RESOLVE* pRects)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResolveImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t rectCount, const XGL_IMAGE_RESOLVE* pRects)
{
nextTable.CmdResolveImage(cmdBuffer, srcImage, destImage, rectCount, pRects);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdSetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent)
+XGL_LAYER_EXPORT void XGLAPI xglCmdSetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent)
{
nextTable.CmdSetEvent(cmdBuffer, event, pipeEvent);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event)
{
nextTable.CmdResetEvent(cmdBuffer, event);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdWaitEvents(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo)
+XGL_LAYER_EXPORT void XGLAPI xglCmdWaitEvents(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo)
{
nextTable.CmdWaitEvents(cmdBuffer, pWaitInfo);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPipelineBarrier( XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPipelineBarrier( XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier)
{
nextTable.CmdPipelineBarrier(cmdBuffer, pBarrier);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdMemoryAtomic(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_UINT64 srcData, XGL_ATOMIC_OP atomicOp)
+XGL_LAYER_EXPORT void XGLAPI xglCmdMemoryAtomic(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, uint64_t srcData, XGL_ATOMIC_OP atomicOp)
{
nextTable.CmdMemoryAtomic(cmdBuffer, destMem, destOffset, srcData, atomicOp);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot, XGL_FLAGS flags)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot, XGL_FLAGS flags)
{
nextTable.CmdBeginQuery(cmdBuffer, queryPool, slot, flags);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot)
+XGL_LAYER_EXPORT void XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot)
{
nextTable.CmdEndQuery(cmdBuffer, queryPool, slot);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResetQueryPool(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResetQueryPool(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount)
{
nextTable.CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdWriteTimestamp(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdWriteTimestamp(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
{
nextTable.CmdWriteTimestamp(cmdBuffer, timestampType, destMem, destOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdInitAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, const XGL_UINT32* pData)
+XGL_LAYER_EXPORT void XGLAPI xglCmdInitAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData)
{
nextTable.CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdLoadAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY srcMem, XGL_GPU_SIZE srcOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdLoadAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_GPU_MEMORY srcMem, XGL_GPU_SIZE srcOffset)
{
nextTable.CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcMem, srcOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdSaveAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdSaveAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
{
nextTable.CmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destMem, destOffset);
}
@@ -1759,7 +1759,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData)
{
// This layer intercepts callbacks
XGL_LAYER_DBG_FUNCTION_NODE *pNewDbgFuncNode = (XGL_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(XGL_LAYER_DBG_FUNCTION_NODE));
@@ -1792,36 +1792,36 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetMessageFilter(XGL_DEVICE device, XGL_INT msgCode, XGL_DBG_MSG_FILTER filter)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetMessageFilter(XGL_DEVICE device, int32_t msgCode, XGL_DBG_MSG_FILTER filter)
{
XGL_RESULT result = nextTable.DbgSetMessageFilter(device, msgCode, filter);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetObjectTag(XGL_BASE_OBJECT object, XGL_SIZE tagSize, const XGL_VOID* pTag)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetObjectTag(XGL_BASE_OBJECT object, size_t tagSize, const void* pTag)
{
XGL_RESULT result = nextTable.DbgSetObjectTag(object, tagSize, pTag);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData)
{
XGL_RESULT result = nextTable.DbgSetGlobalOption(dbgOption, dataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetDeviceOption(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetDeviceOption(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, size_t dataSize, const void* pData)
{
XGL_RESULT result = nextTable.DbgSetDeviceOption(device, dbgOption, dataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDbgMarkerBegin(XGL_CMD_BUFFER cmdBuffer, const XGL_CHAR* pMarker)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerBegin(XGL_CMD_BUFFER cmdBuffer, const char* pMarker)
{
nextTable.CmdDbgMarkerBegin(cmdBuffer, pMarker);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDbgMarkerEnd(XGL_CMD_BUFFER cmdBuffer)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerEnd(XGL_CMD_BUFFER cmdBuffer)
{
nextTable.CmdDbgMarkerEnd(cmdBuffer);
}
@@ -1835,7 +1835,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11GetMSC(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, XGL_UINT64* pMsc)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11GetMSC(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, uint64_t* pMsc)
{
XGL_RESULT result = nextTable.WsiX11GetMSC(device, window, crtc, pMsc);
return result;
@@ -1853,12 +1853,12 @@
return result;
}
-XGL_VOID drawStateDumpDotFile(char* outFileName)
+void drawStateDumpDotFile(char* outFileName)
{
dumpDotFile(outFileName);
}
-XGL_VOID drawStateDumpPngFile(char* outFileName)
+void drawStateDumpPngFile(char* outFileName)
{
char dotExe[32] = "/usr/bin/dot";
if( access(dotExe, X_OK) != -1) {
@@ -1875,7 +1875,7 @@
}
}
-XGL_LAYER_EXPORT XGL_VOID* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* funcName)
+XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* funcName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
void *addr;
diff --git a/layers/draw_state.h b/layers/draw_state.h
index dd6ca72..90cc1fe 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -60,8 +60,8 @@
} DRAW_TYPE;
//prototypes for extension functions
-XGL_VOID drawStateDumpDotFile(char* outFileName);
-XGL_VOID drawStateDumpPngFile(char* outFileName);
+void drawStateDumpDotFile(char* outFileName);
+void drawStateDumpPngFile(char* outFileName);
// Func ptr typedefs
-typedef XGL_VOID (*DRAW_STATE_DUMP_DOT_FILE)(char*);
-typedef XGL_VOID (*DRAW_STATE_DUMP_PNG_FILE)(char*);
+typedef void (*DRAW_STATE_DUMP_DOT_FILE)(char*);
+typedef void (*DRAW_STATE_DUMP_PNG_FILE)(char*);
diff --git a/layers/mem_tracker.c b/layers/mem_tracker.c
index 3da0b43..447c089 100644
--- a/layers/mem_tracker.c
+++ b/layers/mem_tracker.c
@@ -44,14 +44,14 @@
static FILE *g_logFile = NULL;
#define MAX_BINDING 0xFFFFFFFF
-static XGL_UINT lastVtxBinding = MAX_BINDING;
+static uint32_t lastVtxBinding = MAX_BINDING;
// Utility function to handle reporting
-static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType,
+static void layerCbMsg(XGL_DBG_MSG_TYPE msgType,
XGL_VALIDATION_LEVEL validationLevel,
XGL_BASE_OBJECT srcObject,
- XGL_SIZE location,
- XGL_INT msgCode,
+ size_t location,
+ int32_t msgCode,
const char* pLayerPrefix,
const char* pMsg)
{
@@ -117,7 +117,7 @@
// into HEAD of list pointed to by pHEAD & update pHEAD
// Increment 'insert' if new node was inserted
// return XGL_SUCCESS if no errors occur
-static XGL_RESULT insertMiniNode(MINI_NODE** pHEAD, const XGL_BASE_OBJECT data, XGL_UINT* insert)
+static XGL_RESULT insertMiniNode(MINI_NODE** pHEAD, const XGL_BASE_OBJECT data, uint32_t* insert)
{
MINI_NODE* pTrav = *pHEAD;
while (pTrav && (pTrav->data != data)) {
@@ -180,7 +180,7 @@
return pTrav;
}
// Set fence for given cb in global cb node
-static XGL_BOOL setCBFence(const XGL_CMD_BUFFER cb, const XGL_FENCE fence)
+static bool32_t setCBFence(const XGL_CMD_BUFFER cb, const XGL_FENCE fence)
{
GLOBAL_CB_NODE* pTrav = getGlobalCBNode(cb);
if (!pTrav) {
@@ -193,7 +193,7 @@
return XGL_TRUE;
}
-static XGL_BOOL validateCBMemRef(const XGL_CMD_BUFFER cb, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs)
+static bool32_t validateCBMemRef(const XGL_CMD_BUFFER cb, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs)
{
GLOBAL_CB_NODE* pTrav = getGlobalCBNode(cb);
if (!pTrav) {
@@ -402,7 +402,7 @@
// Find Global CB Node and add mem binding to mini LL
// Find Global Mem Obj Node and add CB binding to mini LL
-static XGL_BOOL updateCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY mem)
+static bool32_t updateCBBinding(const XGL_CMD_BUFFER cb, const XGL_GPU_MEMORY mem)
{
// First update CB binding in MemObj mini CB list
GLOBAL_MEM_OBJ_NODE* pMemTrav = getGlobalMemNode(mem);
@@ -425,7 +425,7 @@
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str);
return XGL_FALSE;
}
- XGL_UINT dontCare;
+ uint32_t dontCare;
result = insertMiniNode(&pCBTrav->pMemObjList, mem, &dontCare);
if (XGL_SUCCESS != result)
return result;
@@ -456,7 +456,7 @@
}
}
// Free bindings related to CB
-static XGL_BOOL freeCBBindings(const XGL_CMD_BUFFER cb)
+static bool32_t freeCBBindings(const XGL_CMD_BUFFER cb)
{
GLOBAL_CB_NODE* pCBTrav = getGlobalCBNode(cb);
if (!pCBTrav) {
@@ -481,7 +481,7 @@
// Delete Global CB Node from list along with all of it's mini mem obj node
// and also clear Global mem references to CB
// TODO : When should this be called? There's no Destroy of CBs that I see
-static XGL_BOOL deleteGlobalCBNode(const XGL_CMD_BUFFER cb)
+static bool32_t deleteGlobalCBNode(const XGL_CMD_BUFFER cb)
{
if (XGL_FALSE == freeCBBindings(cb))
return XGL_FALSE;
@@ -501,14 +501,14 @@
return XGL_TRUE;
}
// Delete the entire CB list
-static XGL_BOOL deleteGlobalCBList()
+static bool32_t deleteGlobalCBList()
{
- XGL_BOOL result = XGL_TRUE;
+ bool32_t result = XGL_TRUE;
GLOBAL_CB_NODE* pCBTrav = pGlobalCBHead;
while (pCBTrav) {
XGL_CMD_BUFFER cbToDelete = pCBTrav->cmdBuffer;
pCBTrav = pCBTrav->pNextGlobalCBNode;
- XGL_BOOL tmpResult = deleteGlobalCBNode(cbToDelete);
+ bool32_t tmpResult = deleteGlobalCBNode(cbToDelete);
// If any result is FALSE, final result should be FALSE
if ((XGL_FALSE == tmpResult) || (XGL_FALSE == result))
result = XGL_FALSE;
@@ -519,7 +519,7 @@
// For given MemObj node, report Obj & CB bindings
static void reportMemReferences(const GLOBAL_MEM_OBJ_NODE* pMemObjTrav)
{
- XGL_UINT refCount = 0; // Count found references
+ uint32_t refCount = 0; // Count found references
MINI_NODE* pObjTrav = pMemObjTrav->pObjBindings;
MINI_NODE* pCBTrav = pMemObjTrav->pCmdBufferBindings;
while (pCBTrav) {
@@ -572,7 +572,7 @@
}
}
// Check if fence for given CB is completed
-static XGL_BOOL checkCBCompleted(const XGL_CMD_BUFFER cb)
+static bool32_t checkCBCompleted(const XGL_CMD_BUFFER cb)
{
GLOBAL_CB_NODE* pCBTrav = getGlobalCBNode(cb);
if (!pCBTrav) {
@@ -596,9 +596,9 @@
return XGL_TRUE;
}
-static XGL_BOOL freeMemNode(XGL_GPU_MEMORY mem)
+static bool32_t freeMemNode(XGL_GPU_MEMORY mem)
{
- XGL_BOOL result = XGL_TRUE;
+ bool32_t result = XGL_TRUE;
// Parse global list to find node w/ mem
GLOBAL_MEM_OBJ_NODE* pTrav = getGlobalMemNode(mem);
if (!pTrav) {
@@ -682,7 +682,7 @@
// 1. Remove object node from Global Mem Obj mini LL of obj bindings & free it
// 2. Decrement refCount for Global Mem Obj
// 3. Clear Global Mem Obj ptr from Global Object Node
-static XGL_BOOL clearObjectBinding(XGL_OBJECT object)
+static bool32_t clearObjectBinding(XGL_OBJECT object)
{
GLOBAL_OBJECT_NODE* pGlobalObjTrav = getGlobalObjectNode(object);
if (!pGlobalObjTrav) {
@@ -725,7 +725,7 @@
// Add link from global object node to global memory node
// Add mini-object node & reference off of global obj node
// Return XGL_TRUE if addition is successful, XGL_FALSE otherwise
-static XGL_BOOL updateObjectBinding(XGL_OBJECT object, XGL_GPU_MEMORY mem)
+static bool32_t updateObjectBinding(XGL_OBJECT object, XGL_GPU_MEMORY mem)
{
// Handle NULL case separately, just clear previous binding & decrement reference
if (mem == XGL_NULL_HANDLE) {
@@ -964,12 +964,12 @@
layer_initialize_dispatch_table(&nextTable, fpNextGPA, (XGL_PHYSICAL_GPU) pCurObj->nextObject);
- xglGetProcAddrType fpGetProcAddr = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (XGL_CHAR *) "xglGetProcAddr");
+ xglGetProcAddrType fpGetProcAddr = fpNextGPA((XGL_PHYSICAL_GPU) pCurObj->nextObject, (char *) "xglGetProcAddr");
nextTable.GetProcAddr = fpGetProcAddr;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetGpuInfo(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetGpuInfo(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_GPU_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
pCurObj = gpuw;
@@ -1012,7 +1012,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pExtName)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetExtensionSupport(XGL_PHYSICAL_GPU gpu, const char* pExtName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
pCurObj = gpuw;
@@ -1021,7 +1021,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved)
{
if (gpu != NULL)
{
@@ -1041,13 +1041,13 @@
}
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, XGL_UINT queueIndex, XGL_QUEUE* pQueue)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetDeviceQueue(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, uint32_t queueIndex, XGL_QUEUE* pQueue)
{
XGL_RESULT result = nextTable.GetDeviceQueue(device, queueType, queueIndex, pQueue);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit(XGL_QUEUE queue, XGL_UINT cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSubmit(XGL_QUEUE queue, uint32_t cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence)
{
// TODO : Need to track fence and clear mem references when fence clears
XGL_FENCE localFence = fence;
@@ -1073,7 +1073,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSetGlobalMemReferences(XGL_QUEUE queue, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglQueueSetGlobalMemReferences(XGL_QUEUE queue, uint32_t memRefCount, const XGL_MEMORY_REF* pMemRefs)
{
// TODO : Use global mem references as part of list checked on QueueSubmit above
XGL_RESULT result = nextTable.QueueSetGlobalMemReferences(queue, memRefCount, pMemRefs);
@@ -1127,7 +1127,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglMapMemory(XGL_GPU_MEMORY mem, XGL_FLAGS flags, XGL_VOID** ppData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglMapMemory(XGL_GPU_MEMORY mem, XGL_FLAGS flags, void** ppData)
{
// TODO : Track when memory is mapped
XGL_RESULT result = nextTable.MapMemory(mem, flags, ppData);
@@ -1142,7 +1142,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglPinSystemMemory(XGL_DEVICE device, const XGL_VOID* pSysMem, XGL_SIZE memSize, XGL_GPU_MEMORY* pMem)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglPinSystemMemory(XGL_DEVICE device, const void* pSysMem, size_t memSize, XGL_GPU_MEMORY* pMem)
{
// TODO : Track this
// Verify that memory is actually pinnable
@@ -1150,7 +1150,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglRemapVirtualMemoryPages(XGL_DEVICE device, XGL_UINT rangeCount, const XGL_VIRTUAL_MEMORY_REMAP_RANGE* pRanges, XGL_UINT preWaitSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPreWaitSemaphores, XGL_UINT postSignalSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPostSignalSemaphores)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglRemapVirtualMemoryPages(XGL_DEVICE device, uint32_t rangeCount, const XGL_VIRTUAL_MEMORY_REMAP_RANGE* pRanges, uint32_t preWaitSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPreWaitSemaphores, uint32_t postSignalSemaphoreCount, const XGL_QUEUE_SEMAPHORE* pPostSignalSemaphores)
{
// TODO : Track this
XGL_RESULT result = nextTable.RemapVirtualMemoryPages(device, rangeCount, pRanges, preWaitSemaphoreCount, pPreWaitSemaphores, postSignalSemaphoreCount, pPostSignalSemaphores);
@@ -1234,7 +1234,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetObjectInfo(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetObjectInfo(XGL_BASE_OBJECT object, XGL_OBJECT_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
// TODO : What to track here?
// Could potentially save returned mem requirements and validate values passed into BindObjectMemory for this object
@@ -1243,7 +1243,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, XGL_UINT allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglBindObjectMemory(XGL_OBJECT object, uint32_t allocationIdx, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
{
XGL_RESULT result = nextTable.BindObjectMemory(object, allocationIdx, mem, offset);
// Track objects tied to memory
@@ -1269,7 +1269,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, XGL_UINT fenceCount, const XGL_FENCE* pFences, XGL_BOOL waitAll, XGL_UINT64 timeout)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWaitForFences(XGL_DEVICE device, uint32_t fenceCount, const XGL_FENCE* pFences, bool32_t waitAll, uint64_t timeout)
{
XGL_RESULT result = nextTable.WaitForFences(device, fenceCount, pFences, waitAll, timeout);
return result;
@@ -1323,13 +1323,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetQueryPoolResults(XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetQueryPoolResults(XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetQueryPoolResults(queryPool, startQuery, queryCount, pDataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetFormatInfo(XGL_DEVICE device, XGL_FORMAT format, XGL_FORMAT_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetFormatInfo(device, format, infoType, pDataSize, pData);
return result;
@@ -1344,7 +1344,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetImageSubresourceInfo(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglGetImageSubresourceInfo(XGL_IMAGE image, const XGL_IMAGE_SUBRESOURCE* pSubresource, XGL_SUBRESOURCE_INFO_TYPE infoType, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.GetImageSubresourceInfo(image, pSubresource, infoType, pDataSize, pData);
return result;
@@ -1401,13 +1401,13 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglStorePipeline(XGL_PIPELINE pipeline, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglStorePipeline(XGL_PIPELINE pipeline, size_t* pDataSize, void* pData)
{
XGL_RESULT result = nextTable.StorePipeline(pipeline, pDataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglLoadPipeline(XGL_DEVICE device, XGL_SIZE dataSize, const XGL_VOID* pData, XGL_PIPELINE* pPipeline)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglLoadPipeline(XGL_DEVICE device, size_t dataSize, const void* pData, XGL_PIPELINE* pPipeline)
{
XGL_RESULT result = nextTable.LoadPipeline(device, dataSize, pData, pPipeline);
return result;
@@ -1437,37 +1437,37 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglBeginDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
+XGL_LAYER_EXPORT void XGLAPI xglBeginDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
{
nextTable.BeginDescriptorSetUpdate(descriptorSet);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglEndDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
+XGL_LAYER_EXPORT void XGLAPI xglEndDescriptorSetUpdate(XGL_DESCRIPTOR_SET descriptorSet)
{
nextTable.EndDescriptorSetUpdate(descriptorSet);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachSamplerDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_SAMPLER* pSamplers)
+XGL_LAYER_EXPORT void XGLAPI xglAttachSamplerDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_SAMPLER* pSamplers)
{
nextTable.AttachSamplerDescriptors(descriptorSet, startSlot, slotCount, pSamplers);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachImageViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
+XGL_LAYER_EXPORT void XGLAPI xglAttachImageViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_IMAGE_VIEW_ATTACH_INFO* pImageViews)
{
nextTable.AttachImageViewDescriptors(descriptorSet, startSlot, slotCount, pImageViews);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachMemoryViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
+XGL_LAYER_EXPORT void XGLAPI xglAttachMemoryViewDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemViews)
{
nextTable.AttachMemoryViewDescriptors(descriptorSet, startSlot, slotCount, pMemViews);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglAttachNestedDescriptors(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount, const XGL_DESCRIPTOR_SET_ATTACH_INFO* pNestedDescriptorSets)
+XGL_LAYER_EXPORT void XGLAPI xglAttachNestedDescriptors(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount, const XGL_DESCRIPTOR_SET_ATTACH_INFO* pNestedDescriptorSets)
{
nextTable.AttachNestedDescriptors(descriptorSet, startSlot, slotCount, pNestedDescriptorSets);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglClearDescriptorSetSlots(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount)
+XGL_LAYER_EXPORT void XGLAPI xglClearDescriptorSetSlots(XGL_DESCRIPTOR_SET descriptorSet, uint32_t startSlot, uint32_t slotCount)
{
nextTable.ClearDescriptorSetSlots(descriptorSet, startSlot, slotCount);
}
@@ -1552,7 +1552,7 @@
}
// TODO : For any xglCmdBind* calls that include an object which has mem bound to it,
// need to account for that mem now having binding to given cmdBuffer
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipeline(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline)
{
#if 0
// TODO : If memory bound to pipeline, then need to tie that mem to cmdBuffer
@@ -1563,24 +1563,24 @@
} else {
char str[1024];
sprintf(str, "Attempt to bind Pipeline %p to non-existant command buffer %p!", (void*)pipeline, cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, (XGL_CHAR *) "DS", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str);
}
}
else {
char str[1024];
sprintf(str, "Attempt to bind Pipeline %p that doesn't exist!", (void*)pipeline);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pipeline, 0, MEMTRACK_INVALID_OBJECT, (XGL_CHAR *) "DS", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, pipeline, 0, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str);
}
#endif
nextTable.CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindPipelineDelta(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindPipelineDelta(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE_DELTA delta)
{
nextTable.CmdBindPipelineDelta(cmdBuffer, pipelineBindPoint, delta);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindStateObject(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_STATE_OBJECT state)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindStateObject(XGL_CMD_BUFFER cmdBuffer, XGL_STATE_BIND_POINT stateBindPoint, XGL_STATE_OBJECT state)
{
GLOBAL_OBJECT_NODE *pNode;
GLOBAL_CB_NODE *pCmdBuf = getGlobalCBNode(cmdBuffer);
@@ -1599,18 +1599,18 @@
nextTable.CmdBindStateObject(cmdBuffer, stateBindPoint, state);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT index, XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT slotOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindDescriptorSet(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t index, XGL_DESCRIPTOR_SET descriptorSet, uint32_t slotOffset)
{
// TODO : Somewhere need to verify that all textures referenced by shaders in DS are in some type of *SHADER_READ* state
nextTable.CmdBindDescriptorSet(cmdBuffer, pipelineBindPoint, index, descriptorSet, slotOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindDynamicMemoryView(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemView)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindDynamicMemoryView(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemView)
{
nextTable.CmdBindDynamicMemoryView(cmdBuffer, pipelineBindPoint, pMemView);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindVertexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT binding)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindVertexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t binding)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
@@ -1625,7 +1625,7 @@
layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_CB, "MEM", str);
} else {
MEMORY_BINDING *pBindInfo;
- XGL_UINT dontCare;
+ uint32_t dontCare;
XGL_RESULT result;
pBindInfo = malloc(sizeof(MEMORY_BINDING));
pBindInfo->offset = offset;
@@ -1642,7 +1642,7 @@
nextTable.CmdBindVertexData(cmdBuffer, mem, offset, binding);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindIndexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindIndexData(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType)
{
// Track this memory. What exactly is this call doing?
// TODO : verify state of memory is XGL_MEMORY_STATE_INDEX_DATA
@@ -1656,10 +1656,10 @@
if (!pCBTrav) {
char str[1024];
sprintf(str, "Trying to BindIndexData mem obj %p to CB %p but no Node for that CB. Was CB incorrectly destroyed?", mem, cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_MEM_OBJ, (XGL_CHAR *) "MEM", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_MEM_OBJ, (char *) "MEM", (char *) str);
} else {
MEMORY_BINDING *pBindInfo;
- XGL_UINT dontCare;
+ uint32_t dontCare;
XGL_RESULT result;
pBindInfo = malloc(sizeof(MEMORY_BINDING));
pBindInfo->indexType = indexType;
@@ -1676,20 +1676,20 @@
nextTable.CmdBindIndexData(cmdBuffer, mem, offset, indexType);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBindAttachments(XGL_CMD_BUFFER cmdBuffer, XGL_UINT colorAttachmentCount, const XGL_COLOR_ATTACHMENT_BIND_INFO* pColorAttachments, const XGL_DEPTH_STENCIL_BIND_INFO* pDepthStencilAttachment)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBindAttachments(XGL_CMD_BUFFER cmdBuffer, uint32_t colorAttachmentCount, const XGL_COLOR_ATTACHMENT_BIND_INFO* pColorAttachments, const XGL_DEPTH_STENCIL_BIND_INFO* pDepthStencilAttachment)
{
// TODO : Verify that memory for attachments is in the correct state
nextTable.CmdBindAttachments(cmdBuffer, colorAttachmentCount, pColorAttachments, pDepthStencilAttachment);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPrepareMemoryRegions(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_MEMORY_STATE_TRANSITION* pStateTransitions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPrepareMemoryRegions(XGL_CMD_BUFFER cmdBuffer, uint32_t transitionCount, const XGL_MEMORY_STATE_TRANSITION* pStateTransitions)
{
for (int i=0; i < transitionCount; i++) {
XGL_GPU_MEMORY mem = pStateTransitions[i].mem;
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
sprintf(str, "In xglCmdPrepareMemoryRegions() call unable to update binding of mem %p to cmdBuffer %p", mem, cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, (XGL_CHAR *) "MEM", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, (char *) "MEM", (char *) str);
} else {
// TODO : Need to intelligently set state so it's captured on per-region basis (not per mem obj)
setMemTransition(mem, &pStateTransitions[i]);
@@ -1698,7 +1698,7 @@
if (pMem->transition.memory.newState != pStateTransitions[i].oldState) {
char str[1024];
sprintf(str, "In xglCmdPrepareMemoryRegions() call, mem %p actual oldState of %s doesn't match transition oldState of %s", mem, string_XGL_MEMORY_STATE(pMem->transition.memory.newState), string_XGL_MEMORY_STATE(pStateTransitions[i].oldState));
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_STATE, (XGL_CHAR *) "MEM", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_STATE, (char *) "MEM", (char *) str);
}
// Once state is validated, update to current state
memcpy(&pMem->transition, &pStateTransitions[i], sizeof(XGL_MEMORY_STATE_TRANSITION));
@@ -1708,14 +1708,14 @@
nextTable.CmdPrepareMemoryRegions(cmdBuffer, transitionCount, pStateTransitions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPrepareImages(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_IMAGE_STATE_TRANSITION* pStateTransitions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPrepareImages(XGL_CMD_BUFFER cmdBuffer, uint32_t transitionCount, const XGL_IMAGE_STATE_TRANSITION* pStateTransitions)
{
for (int i=0; i < transitionCount; i++) {
XGL_GPU_MEMORY mem = getMemBindingFromObject(pStateTransitions[i].image);
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
sprintf(str, "In xglCmdPrepareImages() call unable to update binding of mem %p to cmdBuffer %p", mem, cmdBuffer);
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, (XGL_CHAR *) "MEM", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, (char *) "MEM", (char *) str);
} else {
// TODO : Need to intelligently set state so it's captured on per-region basis (not per mem obj)
//GLOBAL_MEM_OBJ_NODE* pMem = getGlobalMemNode(mem);
@@ -1724,7 +1724,7 @@
if ((XGL_IMAGE_STATE)pMem->transition.image.newState != pStateTransitions[i].oldState) {
char str[1024];
sprintf(str, "In xglCmdPrepareImages() call, mem %p w/ image %p actual oldState of %s doesn't match transition oldState of %s", mem, pStateTransitions[i].image, string_XGL_IMAGE_STATE(pMem->transition.image.newState), string_XGL_IMAGE_STATE(pStateTransitions[i].oldState));
- layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_STATE, (XGL_CHAR *) "MEM", (XGL_CHAR *) str);
+ layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_INVALID_STATE, (char *) "MEM", (char *) str);
}
memcpy(&pMem->transition, &pStateTransitions[i], sizeof(XGL_IMAGE_STATE_TRANSITION));
*/
@@ -1733,17 +1733,17 @@
nextTable.CmdPrepareImages(cmdBuffer, transitionCount, pStateTransitions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDraw(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDraw(XGL_CMD_BUFFER cmdBuffer, uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
{
nextTable.CmdDraw(cmdBuffer, firstVertex, vertexCount, firstInstance, instanceCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndexed(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstIndex, XGL_UINT indexCount, XGL_INT vertexOffset, XGL_UINT firstInstance, XGL_UINT instanceCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexed(XGL_CMD_BUFFER cmdBuffer, uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount)
{
nextTable.CmdDrawIndexed(cmdBuffer, firstIndex, indexCount, vertexOffset, firstInstance, instanceCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
@@ -1753,7 +1753,7 @@
nextTable.CmdDrawIndirect(cmdBuffer, mem, offset, count, stride);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDrawIndexedIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT32 count, XGL_UINT32 stride)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDrawIndexedIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, uint32_t count, uint32_t stride)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
@@ -1763,12 +1763,12 @@
nextTable.CmdDrawIndexedIndirect(cmdBuffer, mem, offset, count, stride);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDispatch(XGL_CMD_BUFFER cmdBuffer, XGL_UINT x, XGL_UINT y, XGL_UINT z)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDispatch(XGL_CMD_BUFFER cmdBuffer, uint32_t x, uint32_t y, uint32_t z)
{
nextTable.CmdDispatch(cmdBuffer, x, y, z);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDispatchIndirect(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
char str[1024];
@@ -1778,7 +1778,7 @@
nextTable.CmdDispatchIndirect(cmdBuffer, mem, offset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_GPU_MEMORY destMem, XGL_UINT regionCount, const XGL_MEMORY_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_GPU_MEMORY destMem, uint32_t regionCount, const XGL_MEMORY_COPY* pRegions)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, srcMem)) {
char str[1024];
@@ -1793,13 +1793,13 @@
nextTable.CmdCopyMemory(cmdBuffer, srcMem, destMem, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t regionCount, const XGL_IMAGE_COPY* pRegions)
{
// TODO : Each image will have mem mapping so track them
nextTable.CmdCopyImage(cmdBuffer, srcImage, destImage, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyMemoryToImage(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_IMAGE destImage, XGL_UINT regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyMemoryToImage(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY srcMem, XGL_IMAGE destImage, uint32_t regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
{
// TODO : Track this
XGL_GPU_MEMORY mem = getMemBindingFromObject(destImage);
@@ -1816,7 +1816,7 @@
nextTable.CmdCopyMemoryToImage(cmdBuffer, srcMem, destImage, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCopyImageToMemory(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_GPU_MEMORY destMem, XGL_UINT regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCopyImageToMemory(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_GPU_MEMORY destMem, uint32_t regionCount, const XGL_MEMORY_IMAGE_COPY* pRegions)
{
// TODO : Track this
XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage);
@@ -1833,7 +1833,7 @@
nextTable.CmdCopyImageToMemory(cmdBuffer, srcImage, destMem, regionCount, pRegions);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdCloneImageData(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout)
+XGL_LAYER_EXPORT void XGLAPI xglCmdCloneImageData(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout)
{
// TODO : Each image will have mem mapping so track them
XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage);
@@ -1851,7 +1851,7 @@
nextTable.CmdCloneImageData(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdUpdateMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const XGL_UINT32* pData)
+XGL_LAYER_EXPORT void XGLAPI xglCmdUpdateMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const uint32_t* pData)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, destMem)) {
char str[1024];
@@ -1861,7 +1861,7 @@
nextTable.CmdUpdateMemory(cmdBuffer, destMem, destOffset, dataSize, pData);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdFillMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, XGL_UINT32 data)
+XGL_LAYER_EXPORT void XGLAPI xglCmdFillMemory(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, uint32_t data)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, destMem)) {
char str[1024];
@@ -1871,7 +1871,7 @@
nextTable.CmdFillMemory(cmdBuffer, destMem, destOffset, fillSize, data);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_FLOAT color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
// TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state
XGL_GPU_MEMORY mem = getMemBindingFromObject(image);
@@ -1883,7 +1883,7 @@
nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const XGL_UINT32 color[4], XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
// TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state
XGL_GPU_MEMORY mem = getMemBindingFromObject(image);
@@ -1895,7 +1895,7 @@
nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_FLOAT depth, XGL_UINT32 stencil, XGL_UINT rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
{
// TODO : Verify memory is in XGL_IMAGE_STATE_CLEAR state
XGL_GPU_MEMORY mem = getMemBindingFromObject(image);
@@ -1907,7 +1907,7 @@
nextTable.CmdClearDepthStencil(cmdBuffer, image, depth, stencil, rangeCount, pRanges);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResolveImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, XGL_UINT rectCount, const XGL_IMAGE_RESOLVE* pRects)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResolveImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t rectCount, const XGL_IMAGE_RESOLVE* pRects)
{
XGL_GPU_MEMORY mem = getMemBindingFromObject(srcImage);
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
@@ -1924,27 +1924,27 @@
nextTable.CmdResolveImage(cmdBuffer, srcImage, destImage, rectCount, pRects);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdSetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent)
+XGL_LAYER_EXPORT void XGLAPI xglCmdSetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent)
{
nextTable.CmdSetEvent(cmdBuffer, event, pipeEvent);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResetEvent(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event)
{
nextTable.CmdResetEvent(cmdBuffer, event);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdWaitEvents(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo)
+XGL_LAYER_EXPORT void XGLAPI xglCmdWaitEvents(XGL_CMD_BUFFER cmdBuffer, const XGL_EVENT_WAIT_INFO* pWaitInfo)
{
nextTable.CmdWaitEvents(cmdBuffer, pWaitInfo);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdPipelineBarrier( XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier)
+XGL_LAYER_EXPORT void XGLAPI xglCmdPipelineBarrier( XGL_CMD_BUFFER cmdBuffer, const XGL_PIPELINE_BARRIER* pBarrier)
{
nextTable.CmdPipelineBarrier(cmdBuffer, pBarrier);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdMemoryAtomic(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, XGL_UINT64 srcData, XGL_ATOMIC_OP atomicOp)
+XGL_LAYER_EXPORT void XGLAPI xglCmdMemoryAtomic(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset, uint64_t srcData, XGL_ATOMIC_OP atomicOp)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, destMem)) {
char str[1024];
@@ -1954,7 +1954,7 @@
nextTable.CmdMemoryAtomic(cmdBuffer, destMem, destOffset, srcData, atomicOp);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot, XGL_FLAGS flags)
+XGL_LAYER_EXPORT void XGLAPI xglCmdBeginQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot, XGL_FLAGS flags)
{
XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool);
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
@@ -1965,7 +1965,7 @@
nextTable.CmdBeginQuery(cmdBuffer, queryPool, slot, flags);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT slot)
+XGL_LAYER_EXPORT void XGLAPI xglCmdEndQuery(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t slot)
{
XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool);
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
@@ -1976,7 +1976,7 @@
nextTable.CmdEndQuery(cmdBuffer, queryPool, slot);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdResetQueryPool(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, XGL_UINT startQuery, XGL_UINT queryCount)
+XGL_LAYER_EXPORT void XGLAPI xglCmdResetQueryPool(XGL_CMD_BUFFER cmdBuffer, XGL_QUERY_POOL queryPool, uint32_t startQuery, uint32_t queryCount)
{
XGL_GPU_MEMORY mem = getMemBindingFromObject(queryPool);
if (XGL_FALSE == updateCBBinding(cmdBuffer, mem)) {
@@ -1987,7 +1987,7 @@
nextTable.CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdWriteTimestamp(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdWriteTimestamp(XGL_CMD_BUFFER cmdBuffer, XGL_TIMESTAMP_TYPE timestampType, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, destMem)) {
char str[1024];
@@ -1997,12 +1997,12 @@
nextTable.CmdWriteTimestamp(cmdBuffer, timestampType, destMem, destOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdInitAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, const XGL_UINT32* pData)
+XGL_LAYER_EXPORT void XGLAPI xglCmdInitAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData)
{
nextTable.CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdLoadAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY srcMem, XGL_GPU_SIZE srcOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdLoadAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_GPU_MEMORY srcMem, XGL_GPU_SIZE srcOffset)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, srcMem)) {
char str[1024];
@@ -2012,7 +2012,7 @@
nextTable.CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcMem, srcOffset);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdSaveAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
+XGL_LAYER_EXPORT void XGLAPI xglCmdSaveAtomicCounters(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset)
{
if (XGL_FALSE == updateCBBinding(cmdBuffer, destMem)) {
char str[1024];
@@ -2028,7 +2028,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData)
{
// This layer intercepts callbacks
XGL_LAYER_DBG_FUNCTION_NODE *pNewDbgFuncNode = (XGL_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(XGL_LAYER_DBG_FUNCTION_NODE));
@@ -2061,36 +2061,36 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetMessageFilter(XGL_DEVICE device, XGL_INT msgCode, XGL_DBG_MSG_FILTER filter)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetMessageFilter(XGL_DEVICE device, int32_t msgCode, XGL_DBG_MSG_FILTER filter)
{
XGL_RESULT result = nextTable.DbgSetMessageFilter(device, msgCode, filter);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetObjectTag(XGL_BASE_OBJECT object, XGL_SIZE tagSize, const XGL_VOID* pTag)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetObjectTag(XGL_BASE_OBJECT object, size_t tagSize, const void* pTag)
{
XGL_RESULT result = nextTable.DbgSetObjectTag(object, tagSize, pTag);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData)
{
XGL_RESULT result = nextTable.DbgSetGlobalOption(dbgOption, dataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetDeviceOption(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgSetDeviceOption(XGL_DEVICE device, XGL_DBG_DEVICE_OPTION dbgOption, size_t dataSize, const void* pData)
{
XGL_RESULT result = nextTable.DbgSetDeviceOption(device, dbgOption, dataSize, pData);
return result;
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDbgMarkerBegin(XGL_CMD_BUFFER cmdBuffer, const XGL_CHAR* pMarker)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerBegin(XGL_CMD_BUFFER cmdBuffer, const char* pMarker)
{
nextTable.CmdDbgMarkerBegin(cmdBuffer, pMarker);
}
-XGL_LAYER_EXPORT XGL_VOID XGLAPI xglCmdDbgMarkerEnd(XGL_CMD_BUFFER cmdBuffer)
+XGL_LAYER_EXPORT void XGLAPI xglCmdDbgMarkerEnd(XGL_CMD_BUFFER cmdBuffer)
{
nextTable.CmdDbgMarkerEnd(cmdBuffer);
}
@@ -2104,7 +2104,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11GetMSC(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, XGL_UINT64* pMsc)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglWsiX11GetMSC(XGL_DEVICE device, xcb_window_t window, xcb_randr_crtc_t crtc, uint64_t* pMsc)
{
XGL_RESULT result = nextTable.WsiX11GetMSC(device, window, crtc, pMsc);
return result;
@@ -2134,7 +2134,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* funcName)
+XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* funcName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
void *addr;
diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h
index 61951a9..1815798 100644
--- a/layers/mem_tracker.h
+++ b/layers/mem_tracker.h
@@ -106,7 +106,7 @@
struct _GLOBAL_MEM_OBJ_NODE* pNextGlobalNode; // Ptr to next mem obj in global list of all objs
MINI_NODE* pObjBindings; // Ptr to list of objects bound to this memory
MINI_NODE* pCmdBufferBindings; // Ptr to list of cmd buffers that this mem object references
- XGL_UINT refCount; // Count of references (obj bindings or CB use)
+ uint32_t refCount; // Count of references (obj bindings or CB use)
XGL_GPU_MEMORY mem;
XGL_MEMORY_ALLOC_INFO allocInfo;
uint32_t numRegions; // Allocation may be broken into various regions
@@ -147,7 +147,7 @@
typedef struct _MEMORY_BINDING {
XGL_OBJECT mem;
XGL_GPU_SIZE offset;
- XGL_UINT binding;
+ uint32_t binding;
XGL_INDEX_TYPE indexType;
} MEMORY_BINDING;
@@ -157,7 +157,7 @@
typedef struct _DS_BINDING {
XGL_PIPELINE_BIND_POINT pipelineBindPoint;
XGL_DESCRIPTOR_SET descriptorSet;
- XGL_UINT slotOffset;
+ uint32_t slotOffset;
} DS_BINDING;
// Store a single LL of command buffers
@@ -170,7 +170,7 @@
GLOBAL_OBJECT_NODE* pDynamicState[XGL_NUM_STATE_BIND_POINT];
XGL_PIPELINE pipelines[XGL_NUM_PIPELINE_BIND_POINT];
DS_BINDING descriptorSets[XGL_MAX_DESCRIPTOR_SETS];
- XGL_UINT colorAttachmentCount;
+ uint32_t colorAttachmentCount;
XGL_COLOR_ATTACHMENT_BIND_INFO attachments[XGL_MAX_COLOR_ATTACHMENTS];
XGL_DEPTH_STENCIL_BIND_INFO dsBindInfo;
XGL_CMD_BUFFER cmdBuffer;
diff --git a/layers/multi.cpp b/layers/multi.cpp
index e706bb3..b8c9631 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -33,7 +33,7 @@
static void initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw, XGL_LAYER_DISPATCH_TABLE *pTable, const unsigned int layerNum);
/******************************** Layer multi1 functions **************************/
-static std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *> tableMap1;
+static std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *> tableMap1;
static bool layer1_first_activated = false;
static XGL_LAYER_DISPATCH_TABLE * getLayer1Table(const XGL_BASE_LAYER_OBJECT *gpuw)
@@ -41,11 +41,11 @@
XGL_LAYER_DISPATCH_TABLE *pTable;
assert(gpuw);
- std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap1.find((XGL_VOID *) gpuw);
+ std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap1.find((void *) gpuw);
if (it == tableMap1.end())
{
pTable = new XGL_LAYER_DISPATCH_TABLE;
- tableMap1[(XGL_VOID *) gpuw] = pTable;
+ tableMap1[(void *) gpuw] = pTable;
initLayerTable(gpuw, pTable, 1);
return pTable;
} else
@@ -85,7 +85,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi1StorePipeline(XGL_PIPELINE pipeline, XGL_SIZE* pDataSize, XGL_VOID* pData)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi1StorePipeline(XGL_PIPELINE pipeline, size_t* pDataSize, void* pData)
{
XGL_LAYER_DISPATCH_TABLE* pTable = tableMap1[pipeline];
@@ -95,9 +95,9 @@
return result;
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi1EnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize,
- XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers,
- XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi1EnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize,
+ size_t* pOutLayerCount, char* const* pOutLayers,
+ void* pReserved)
{
if (gpu == NULL)
return xglEnumerateLayers(gpu, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved);
@@ -111,7 +111,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID * XGLAPI multi1GetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName)
+XGL_LAYER_EXPORT void * XGLAPI multi1GetProcAddr(XGL_PHYSICAL_GPU gpu, const char* pName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
@@ -121,13 +121,13 @@
getLayer1Table(gpuw);
if (!strncmp("xglCreateDevice", pName, sizeof ("xglCreateDevice")))
- return (XGL_VOID *) multi1CreateDevice;
+ return (void *) multi1CreateDevice;
else if (!strncmp("xglEnumerateLayers", pName, sizeof ("xglEnumerateLayers")))
- return (XGL_VOID *) multi1EnumerateLayers;
+ return (void *) multi1EnumerateLayers;
else if (!strncmp("xglCreateGraphicsPipeline", pName, sizeof ("xglCreateGraphicsPipeline")))
- return (XGL_VOID *) multi1CreateGraphicsPipeline;
+ return (void *) multi1CreateGraphicsPipeline;
else if (!strncmp("xglStorePipeline", pName, sizeof ("xglStorePipeline")))
- return (XGL_VOID *) multi1StorePipeline;
+ return (void *) multi1StorePipeline;
else {
if (gpuw->pGPA == NULL)
return NULL;
@@ -136,7 +136,7 @@
}
/******************************** Layer multi2 functions **************************/
-static std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *> tableMap2;
+static std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *> tableMap2;
static bool layer2_first_activated = false;
static XGL_LAYER_DISPATCH_TABLE * getLayer2Table(const XGL_BASE_LAYER_OBJECT *gpuw)
@@ -144,11 +144,11 @@
XGL_LAYER_DISPATCH_TABLE *pTable;
assert(gpuw);
- std::unordered_map<XGL_VOID *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap2.find((XGL_VOID *) gpuw);
+ std::unordered_map<void *, XGL_LAYER_DISPATCH_TABLE *>::const_iterator it = tableMap2.find((void *) gpuw);
if (it == tableMap2.end())
{
pTable = new XGL_LAYER_DISPATCH_TABLE;
- tableMap2[(XGL_VOID *) gpuw] = pTable;
+ tableMap2[(void *) gpuw] = pTable;
initLayerTable(gpuw, pTable, 2);
return pTable;
} else
@@ -195,9 +195,9 @@
}
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi2EnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize,
- XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers,
- XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI multi2EnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize,
+ size_t* pOutLayerCount, char* const* pOutLayers,
+ void* pReserved)
{
if (gpu == NULL)
return xglEnumerateLayers(gpu, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved);
@@ -211,7 +211,7 @@
return result;
}
-XGL_LAYER_EXPORT XGL_VOID * XGLAPI multi2GetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName)
+XGL_LAYER_EXPORT void * XGLAPI multi2GetProcAddr(XGL_PHYSICAL_GPU gpu, const char* pName)
{
XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;
@@ -221,13 +221,13 @@
getLayer2Table(gpuw);
if (!strncmp("xglCreateDevice", pName, sizeof ("xglCreateDevice")))
- return (XGL_VOID *) multi2CreateDevice;
+ return (void *) multi2CreateDevice;
else if (!strncmp("xglEnumerateLayers", pName, sizeof ("xglEnumerateLayers")))
- return (XGL_VOID *) multi2EnumerateLayers;
+ return (void *) multi2EnumerateLayers;
else if (!strncmp("xglCreateCommandBuffer", pName, sizeof ("xglCreateCommandBuffer")))
- return (XGL_VOID *) multi2CreateCommandBuffer;
+ return (void *) multi2CreateCommandBuffer;
else if (!strncmp("xglBeginCommandBuffer", pName, sizeof ("xglBeginCommandBuffer")))
- return (XGL_VOID *) multi2BeginCommandBuffer;
+ return (void *) multi2BeginCommandBuffer;
else {
if (gpuw->pGPA == NULL)
return NULL;
@@ -236,9 +236,9 @@
}
/********************************* Common functions ********************************/
-XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize,
- XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers,
- XGL_VOID* pReserved)
+XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize,
+ size_t* pOutLayerCount, char* const* pOutLayers,
+ void* pReserved)
{
if (pOutLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL || pOutLayers[1] == NULL || pReserved == NULL)
return XGL_ERROR_INVALID_POINTER;
@@ -251,15 +251,15 @@
return XGL_SUCCESS;
}
-XGL_LAYER_EXPORT XGL_VOID * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pName)
+XGL_LAYER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* pName)
{
// to find each layers GPA routine Loader will search via "<layerName>GetProcAddr"
if (!strncmp("multi1GetProcAddr", pName, sizeof("multi1GetProcAddr")))
- return (XGL_VOID *) multi1GetProcAddr;
+ return (void *) multi1GetProcAddr;
else if (!strncmp("multi2GetProcAddr", pName, sizeof("multi2GetProcAddr")))
- return (XGL_VOID *) multi2GetProcAddr;
+ return (void *) multi2GetProcAddr;
else if (!strncmp("xglGetProcAddr", pName, sizeof("xglGetProcAddr")))
- return (XGL_VOID *) xglGetProcAddr;
+ return (void *) xglGetProcAddr;
// use first layer activated as GPA dispatch table activation happens in order
else if (layer1_first_activated)
diff --git a/layers/object_track.h b/layers/object_track.h
index 77102f8..b6d02c3 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -123,13 +123,13 @@
}
typedef struct _OBJTRACK_NODE {
- XGL_VOID *pObj;
+ void *pObj;
XGL_OBJECT_TYPE objType;
- XGL_UINT64 numUses;
+ uint64_t numUses;
} OBJTRACK_NODE;
// prototype for extension functions
-XGL_UINT64 objTrackGetObjectCount(XGL_OBJECT_TYPE type);
-XGL_RESULT objTrackGetObjects(XGL_OBJECT_TYPE type, XGL_UINT64 objCount, OBJTRACK_NODE* pObjNodeArray);
+uint64_t objTrackGetObjectCount(XGL_OBJECT_TYPE type);
+XGL_RESULT objTrackGetObjects(XGL_OBJECT_TYPE type, uint64_t objCount, OBJTRACK_NODE* pObjNodeArray);
// Func ptr typedefs
-typedef XGL_UINT64 (*OBJ_TRACK_GET_OBJECT_COUNT)(XGL_OBJECT_TYPE);
-typedef XGL_RESULT (*OBJ_TRACK_GET_OBJECTS)(XGL_OBJECT_TYPE, XGL_UINT64, OBJTRACK_NODE*);
+typedef uint64_t (*OBJ_TRACK_GET_OBJECT_COUNT)(XGL_OBJECT_TYPE);
+typedef XGL_RESULT (*OBJ_TRACK_GET_OBJECTS)(XGL_OBJECT_TYPE, uint64_t, OBJTRACK_NODE*);
diff --git a/loader/loader.c b/loader/loader.c
index e505b1a..d2b0dcf 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -56,10 +56,10 @@
void *handle;
XGL_LAYER_DISPATCH_TABLE *loader_dispatch;
- XGL_UINT layer_count[XGL_MAX_PHYSICAL_GPUS];
+ uint32_t layer_count[XGL_MAX_PHYSICAL_GPUS];
struct loader_layers layer_libs[XGL_MAX_PHYSICAL_GPUS][MAX_LAYER_LIBRARIES];
XGL_BASE_LAYER_OBJECT *wrappedGpus[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT gpu_count;
+ uint32_t gpu_count;
XGL_BASE_LAYER_OBJECT *gpus;
xglGetProcAddrType GetProcAddr;
@@ -71,7 +71,7 @@
struct loader_msg_callback {
XGL_DBG_MSG_CALLBACK_FUNCTION func;
- XGL_VOID *data;
+ void *data;
struct loader_msg_callback *next;
};
@@ -92,7 +92,7 @@
} loader;
static XGL_RESULT loader_msg_callback_add(XGL_DBG_MSG_CALLBACK_FUNCTION func,
- XGL_VOID *data)
+ void *data)
{
struct loader_msg_callback *cb;
@@ -147,7 +147,7 @@
loader.msg_callbacks = NULL;
}
-static void loader_log(XGL_DBG_MSG_TYPE msg_type, XGL_INT msg_code,
+static void loader_log(XGL_DBG_MSG_TYPE msg_type, int32_t msg_code,
const char *format, ...)
{
const struct loader_msg_callback *cb = loader.msg_callbacks;
@@ -235,7 +235,7 @@
XGL_RESULT res;
while (cb) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) {
+ for (uint32_t i = 0; i < icd->gpu_count; i++) {
res = (icd->loader_dispatch + i)->DbgRegisterMsgCallback(cb->func, cb->data);
if (res != XGL_SUCCESS) {
break;
@@ -249,7 +249,7 @@
const struct loader_msg_callback *tmp = loader.msg_callbacks;
while (tmp != cb) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) {
+ for (uint32_t i = 0; i < icd->gpu_count; i++) {
(icd->loader_dispatch + i)->DbgUnregisterMsgCallback(cb->func);
}
tmp = tmp->next;
@@ -265,7 +265,7 @@
{
#define SETB(icd, opt, val) do { \
if (val) { \
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) { \
+ for (uint32_t i = 0; i < icd->gpu_count; i++) { \
const XGL_RESULT res = \
(icd->loader_dispatch + i)->DbgSetGlobalOption(opt, sizeof(val), &val); \
if (res != XGL_SUCCESS) \
@@ -469,10 +469,10 @@
tab->EnumerateLayers = xglEnumerateLayers;
}
-static struct loader_icd * loader_get_icd(const XGL_BASE_LAYER_OBJECT *gpu, XGL_UINT *gpu_index)
+static struct loader_icd * loader_get_icd(const XGL_BASE_LAYER_OBJECT *gpu, uint32_t *gpu_index)
{
for (struct loader_icd * icd = loader.icds; icd; icd = icd->next) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++)
+ for (uint32_t i = 0; i < icd->gpu_count; i++)
if ((icd->gpus + i) == gpu || (icd->gpus +i)->baseObject == gpu->baseObject) {
*gpu_index = i;
return icd;
@@ -481,7 +481,7 @@
return NULL;
}
-static bool loader_layers_activated(const struct loader_icd *icd, const XGL_UINT gpu_index)
+static bool loader_layers_activated(const struct loader_icd *icd, const uint32_t gpu_index)
{
if (icd->layer_count[gpu_index])
return true;
@@ -489,16 +489,16 @@
return false;
}
-static void loader_init_layer_libs(struct loader_icd *icd, XGL_UINT gpu_index, struct layer_name_pair * pLayerNames, XGL_UINT count)
+static void loader_init_layer_libs(struct loader_icd *icd, uint32_t gpu_index, struct layer_name_pair * pLayerNames, uint32_t count)
{
if (!icd)
return;
struct loader_layers *obj;
bool foundLib;
- for (XGL_UINT i = 0; i < count; i++) {
+ for (uint32_t i = 0; i < count; i++) {
foundLib = false;
- for (XGL_UINT j = 0; j < icd->layer_count[gpu_index]; j++) {
+ for (uint32_t j = 0; j < icd->layer_count[gpu_index]; j++) {
if (icd->layer_libs[gpu_index][j].lib_handle && !strcmp(icd->layer_libs[gpu_index][j].name, (char *) pLayerNames[i].layer_name)) {
foundLib = true;
break;
@@ -520,12 +520,12 @@
}
}
-static bool find_layer_name(struct loader_icd *icd, XGL_UINT gpu_index, const char * layer_name, const char **lib_name)
+static bool find_layer_name(struct loader_icd *icd, uint32_t gpu_index, const char * layer_name, const char **lib_name)
{
void *handle;
xglEnumerateLayersType fpEnumerateLayers;
- XGL_CHAR layer_buf[16][256];
- XGL_CHAR * layers[16];
+ char layer_buf[16][256];
+ char * layers[16];
for (int i = 0; i < 16; i++)
layers[i] = &layer_buf[i][0];
@@ -549,8 +549,8 @@
}
}
else {
- XGL_SIZE cnt;
- fpEnumerateLayers(NULL, 16, 256, &cnt, layers, (XGL_VOID *) icd->gpus + gpu_index);
+ size_t cnt;
+ fpEnumerateLayers(NULL, 16, 256, &cnt, layers, (void *) icd->gpus + gpu_index);
for (unsigned int i = 0; i < cnt; i++) {
if (!strcmp((char *) layers[i], layer_name)) {
dlclose(handle);
@@ -565,10 +565,10 @@
return false;
}
-static XGL_UINT loader_get_layer_env(struct loader_icd *icd, XGL_UINT gpu_index, struct layer_name_pair *pLayerNames)
+static uint32_t loader_get_layer_env(struct loader_icd *icd, uint32_t gpu_index, struct layer_name_pair *pLayerNames)
{
const char *layerEnv;
- XGL_UINT len, count = 0;
+ uint32_t len, count = 0;
char *p, *pOrig, *next, *name;
layerEnv = getenv("LIBXGL_LAYER_NAMES");
@@ -616,7 +616,7 @@
return count;
}
-static XGL_UINT loader_get_layer_libs(struct loader_icd *icd, XGL_UINT gpu_index, const XGL_DEVICE_CREATE_INFO* pCreateInfo, struct layer_name_pair **ppLayerNames)
+static uint32_t loader_get_layer_libs(struct loader_icd *icd, uint32_t gpu_index, const XGL_DEVICE_CREATE_INFO* pCreateInfo, struct layer_name_pair **ppLayerNames)
{
static struct layer_name_pair layerNames[MAX_LAYER_LIBRARIES];
@@ -631,8 +631,8 @@
while (pCi) {
if (pCi->sType == XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO) {
const char *name;
- XGL_UINT len;
- for (XGL_UINT i = 0; i < pCi->layerCount; i++) {
+ uint32_t len;
+ for (uint32_t i = 0; i < pCi->layerCount; i++) {
const char * lib_name = NULL;
name = *(pCi->ppActiveLayerNames + i);
if (!find_layer_name(icd, gpu_index, name, &lib_name))
@@ -664,9 +664,9 @@
if (icd->loader_dispatch)
free(icd->loader_dispatch);
icd->loader_dispatch = NULL;
- for (XGL_UINT j = 0; j < icd->gpu_count; j++) {
+ for (uint32_t j = 0; j < icd->gpu_count; j++) {
if (icd->layer_count[j] > 0) {
- for (XGL_UINT i = 0; i < icd->layer_count[j]; i++) {
+ for (uint32_t i = 0; i < icd->layer_count[j]; i++) {
libs = &(icd->layer_libs[j][i]);
if (libs->lib_handle)
dlclose(libs->lib_handle);
@@ -681,10 +681,10 @@
}
}
-extern XGL_UINT loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo)
+extern uint32_t loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo)
{
- XGL_UINT gpu_index;
- XGL_UINT count;
+ uint32_t gpu_index;
+ uint32_t count;
struct layer_name_pair *pLayerNames;
struct loader_icd *icd = loader_get_icd((const XGL_BASE_LAYER_OBJECT *) gpu, &gpu_index);
@@ -706,7 +706,7 @@
icd->wrappedGpus[gpu_index] = malloc(sizeof(XGL_BASE_LAYER_OBJECT) * icd->layer_count[gpu_index]);
if (! icd->wrappedGpus[gpu_index])
loader_log(XGL_DBG_MSG_ERROR, 0, "Failed to malloc Gpu objects for layer");
- for (XGL_INT i = icd->layer_count[gpu_index] - 1; i >= 0; i--) {
+ for (int32_t i = icd->layer_count[gpu_index] - 1; i >= 0; i--) {
nextGpuObj = (icd->wrappedGpus[gpu_index] + i);
nextGpuObj->pGPA = nextGPA;
nextGpuObj->baseObject = baseObj;
@@ -737,7 +737,7 @@
else {
//make sure requested Layers matches currently activated Layers
count = loader_get_layer_libs(icd, gpu_index, pCreateInfo, &pLayerNames);
- for (XGL_UINT i = 0; i < count; i++) {
+ for (uint32_t i = 0; i < count; i++) {
if (strcmp(icd->layer_libs[gpu_index][i].name, pLayerNames[i].layer_name)) {
loader_log(XGL_DBG_MSG_ERROR, 0, "Layers activated != Layers requested");
break;
@@ -750,7 +750,7 @@
return icd->layer_count[gpu_index];
}
-LOADER_EXPORT XGL_VOID * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR * pName) {
+LOADER_EXPORT void * XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char * pName) {
if (gpu == NULL)
return NULL;
@@ -771,11 +771,11 @@
}
}
-LOADER_EXPORT XGL_RESULT XGLAPI xglInitAndEnumerateGpus(const XGL_APPLICATION_INFO* pAppInfo, const XGL_ALLOC_CALLBACKS* pAllocCb, XGL_UINT maxGpus, XGL_UINT* pGpuCount, XGL_PHYSICAL_GPU* pGpus)
+LOADER_EXPORT XGL_RESULT XGLAPI xglInitAndEnumerateGpus(const XGL_APPLICATION_INFO* pAppInfo, const XGL_ALLOC_CALLBACKS* pAllocCb, uint32_t maxGpus, uint32_t* pGpuCount, XGL_PHYSICAL_GPU* pGpus)
{
static pthread_once_t once = PTHREAD_ONCE_INIT;
struct loader_icd *icd;
- XGL_UINT count = 0;
+ uint32_t count = 0;
XGL_RESULT res;
// cleanup any prior layer initializations
@@ -791,7 +791,7 @@
XGL_PHYSICAL_GPU gpus[XGL_MAX_PHYSICAL_GPUS];
XGL_BASE_LAYER_OBJECT * wrappedGpus;
xglGetProcAddrType getProcAddr = icd->GetProcAddr;
- XGL_UINT n, max = maxGpus - count;
+ uint32_t n, max = maxGpus - count;
if (max > XGL_MAX_PHYSICAL_GPUS) {
max = XGL_MAX_PHYSICAL_GPUS;
@@ -841,16 +841,16 @@
return (count > 0) ? XGL_SUCCESS : res;
}
-LOADER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_SIZE* pOutLayerCount, XGL_CHAR* const* pOutLayers, XGL_VOID* pReserved)
+LOADER_EXPORT XGL_RESULT XGLAPI xglEnumerateLayers(XGL_PHYSICAL_GPU gpu, size_t maxLayerCount, size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved)
{
- XGL_UINT gpu_index;
- XGL_UINT count = 0;
+ uint32_t gpu_index;
+ uint32_t count = 0;
char *lib_name;
struct loader_icd *icd = loader_get_icd((const XGL_BASE_LAYER_OBJECT *) gpu, &gpu_index);
void *handle;
xglEnumerateLayersType fpEnumerateLayers;
- XGL_CHAR layer_buf[16][256];
- XGL_CHAR * layers[16];
+ char layer_buf[16][256];
+ char * layers[16];
if (pOutLayerCount == NULL || pOutLayers == NULL)
return XGL_ERROR_INVALID_POINTER;
@@ -887,11 +887,11 @@
free(cpyStr);
}
else {
- XGL_SIZE cnt;
- XGL_UINT n;
+ size_t cnt;
+ uint32_t n;
XGL_RESULT res;
n = (maxStringSize < 256) ? maxStringSize : 256;
- res = fpEnumerateLayers(NULL, 16, n, &cnt, layers, (XGL_VOID *) icd->gpus + gpu_index);
+ res = fpEnumerateLayers(NULL, 16, n, &cnt, layers, (void *) icd->gpus + gpu_index);
dlclose(handle);
if (res != XGL_SUCCESS)
continue;
@@ -911,18 +911,18 @@
return XGL_SUCCESS;
}
-LOADER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData)
+LOADER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData)
{
const struct loader_icd *icd;
XGL_RESULT res;
- XGL_UINT gpu_idx;
+ uint32_t gpu_idx;
if (!loader.scanned) {
return loader_msg_callback_add(pfnMsgCallback, pUserData);
}
for (icd = loader.icds; icd; icd = icd->next) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) {
+ for (uint32_t i = 0; i < icd->gpu_count; i++) {
res = (icd->loader_dispatch + i)->DbgRegisterMsgCallback(pfnMsgCallback, pUserData);
if (res != XGL_SUCCESS) {
gpu_idx = i;
@@ -936,11 +936,11 @@
/* roll back on errors */
if (icd) {
for (const struct loader_icd * tmp = loader.icds; tmp != icd; tmp = tmp->next) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++)
+ for (uint32_t i = 0; i < icd->gpu_count; i++)
(tmp->loader_dispatch + i)->DbgUnregisterMsgCallback(pfnMsgCallback);
}
/* and gpus on current icd */
- for (XGL_UINT i = 0; i < gpu_idx; i++)
+ for (uint32_t i = 0; i < gpu_idx; i++)
(icd->loader_dispatch + i)->DbgUnregisterMsgCallback(pfnMsgCallback);
return res;
@@ -958,7 +958,7 @@
}
for (const struct loader_icd * icd = loader.icds; icd; icd = icd->next) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) {
+ for (uint32_t i = 0; i < icd->gpu_count; i++) {
XGL_RESULT r = (icd->loader_dispatch + i)->DbgUnregisterMsgCallback(pfnMsgCallback);
if (r != XGL_SUCCESS) {
res = r;
@@ -968,7 +968,7 @@
return res;
}
-LOADER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData)
+LOADER_EXPORT XGL_RESULT XGLAPI xglDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData)
{
XGL_RESULT res = XGL_SUCCESS;
@@ -995,7 +995,7 @@
}
for (const struct loader_icd * icd = loader.icds; icd; icd = icd->next) {
- for (XGL_UINT i = 0; i < icd->gpu_count; i++) {
+ for (uint32_t i = 0; i < icd->gpu_count; i++) {
XGL_RESULT r = (icd->loader_dispatch + i)->DbgSetGlobalOption(dbgOption, dataSize, pData);
/* unfortunately we cannot roll back */
if (r != XGL_SUCCESS) {
diff --git a/loader/loader.h b/loader/loader.h
index ac8cfc1..18c05b7 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -40,6 +40,6 @@
# define LOADER_EXPORT
#endif
-extern XGL_UINT loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo);
+extern uint32_t loader_activate_layers(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo);
#define MAX_LAYER_LIBRARIES 64
#endif /* LOADER_H */
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index e734b16..ce615cd 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -29,7 +29,7 @@
namespace xgl_testing {
-XGL_SIZE get_format_size(XGL_FORMAT format);
+size_t get_format_size(XGL_FORMAT format);
class Environment : public ::testing::Environment {
public:
@@ -80,7 +80,7 @@
SOLID,
};
- XGL_SIZE buffer_cpp() const;
+ size_t buffer_cpp() const;
XGL_SUBRESOURCE_LAYOUT buffer_layout(const XGL_BUFFER_IMAGE_COPY ®ion) const;
bool walk(Action action, Buffer &buf) const;
@@ -141,7 +141,7 @@
void Environment::SetUp()
{
XGL_PHYSICAL_GPU gpus[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT count;
+ uint32_t count;
XGL_RESULT err;
err = xglInitAndEnumerateGpus(&app_, NULL, ARRAY_SIZE(gpus), &count, gpus);
@@ -149,7 +149,7 @@
ASSERT_GT(count, default_dev_);
devs_.reserve(count);
- for (XGL_UINT i = 0; i < count; i++) {
+ for (uint32_t i = 0; i < count; i++) {
devs_.push_back(new Device(gpus[i]));
if (i == default_dev_) {
devs_[i]->init();
@@ -165,7 +165,7 @@
delete *it;
devs_.clear();
- XGL_UINT dummy_count;
+ uint32_t dummy_count;
xglInitAndEnumerateGpus(&app_, NULL, 0, &dummy_count, NULL);
}
@@ -176,7 +176,7 @@
{
// create a region for every mip level in array slice 0
XGL_GPU_SIZE offset = 0;
- for (XGL_UINT lv = 0; lv < info_.mipLevels; lv++) {
+ for (uint32_t lv = 0; lv < info_.mipLevels; lv++) {
XGL_BUFFER_IMAGE_COPY region = {};
region.bufferOffset = offset;
@@ -208,12 +208,12 @@
// issue, we can store only the regions for array slice 0 and be smart.
if (info_.arraySize > 1) {
const XGL_GPU_SIZE slice_pitch = offset;
- const XGL_UINT slice_region_count = regions_.size();
+ const uint32_t slice_region_count = regions_.size();
regions_.reserve(slice_region_count * info_.arraySize);
- for (XGL_UINT slice = 1; slice < info_.arraySize; slice++) {
- for (XGL_UINT i = 0; i < slice_region_count; i++) {
+ for (uint32_t slice = 1; slice < info_.arraySize; slice++) {
+ for (uint32_t i = 0; i < slice_region_count; i++) {
XGL_BUFFER_IMAGE_COPY region = regions_[i];
region.bufferOffset += slice_pitch * slice;
@@ -230,8 +230,8 @@
XGL_GPU_SIZE offset = 0;
for (std::vector<XGL_IMAGE_SUBRESOURCE_RANGE>::const_iterator it = ranges.begin();
it != ranges.end(); it++) {
- for (XGL_UINT lv = 0; lv < it->mipLevels; lv++) {
- for (XGL_UINT slice = 0; slice < it->arraySize; slice++) {
+ for (uint32_t lv = 0; lv < it->mipLevels; lv++) {
+ for (uint32_t slice = 0; slice < it->arraySize; slice++) {
XGL_BUFFER_IMAGE_COPY region = {};
region.bufferOffset = offset;
region.imageSubresource = Image::subresource(*it, lv, slice);
@@ -254,7 +254,7 @@
pattern_solid_.push_back(solid[i % solid.size()]);
}
-XGL_SIZE ImageChecker::buffer_cpp() const
+size_t ImageChecker::buffer_cpp() const
{
return get_format_size(info_.format);
}
@@ -287,9 +287,9 @@
bool ImageChecker::walk_region(Action action, const XGL_BUFFER_IMAGE_COPY ®ion,
const XGL_SUBRESOURCE_LAYOUT &layout, void *data) const
{
- for (XGL_INT z = 0; z < region.imageExtent.depth; z++) {
- for (XGL_INT y = 0; y < region.imageExtent.height; y++) {
- for (XGL_INT x = 0; x < region.imageExtent.width; x++) {
+ for (int32_t z = 0; z < region.imageExtent.depth; z++) {
+ for (int32_t y = 0; y < region.imageExtent.height; y++) {
+ for (int32_t x = 0; x < region.imageExtent.width; x++) {
uint8_t *dst = static_cast<uint8_t *>(data);
dst += layout.offset + layout.depthPitch * z +
layout.rowPitch * y + buffer_cpp() * x;
@@ -369,7 +369,7 @@
};
unsigned long hash = 5381;
- for (XGL_INT i = 0; i < ARRAY_SIZE(input); i++)
+ for (int32_t i = 0; i < ARRAY_SIZE(input); i++)
hash = ((hash << 5) + hash) + input[i];
const uint8_t output[4] = { HASH_BYTES(hash) };
@@ -384,11 +384,11 @@
return val;
}
-XGL_SIZE get_format_size(XGL_FORMAT format)
+size_t get_format_size(XGL_FORMAT format)
{
static const struct format_info {
- XGL_SIZE size;
- XGL_UINT channel_count;
+ size_t size;
+ uint32_t channel_count;
} format_table[XGL_NUM_FMT] = {
[XGL_FMT_UNDEFINED] = { 0, 0 },
[XGL_FMT_R4G4_UNORM] = { 1, 2 },
@@ -563,7 +563,7 @@
return format_table[format].size;
}
-XGL_EXTENT3D get_mip_level_extent(const XGL_EXTENT3D &extent, XGL_UINT mip_level)
+XGL_EXTENT3D get_mip_level_extent(const XGL_EXTENT3D &extent, uint32_t mip_level)
{
const XGL_EXTENT3D ext = {
(extent.width >> mip_level) ? extent.width >> mip_level : 1,
@@ -849,7 +849,7 @@
// typedef struct _XGL_EVENT_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure
+ // const void* pNext; // Pointer to next structure
// XGL_FLAGS flags; // Reserved
// } XGL_EVENT_CREATE_INFO;
memset(&event_info, 0, sizeof(event_info));
@@ -1351,13 +1351,13 @@
}
union Color {
- XGL_FLOAT color[4];
- XGL_UINT32 raw[4];
+ float color[4];
+ uint32_t raw[4];
};
bool test_raw_;
- std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const XGL_FLOAT color[4])
+ std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const float color[4])
{
std::vector<uint8_t> raw;
@@ -1382,7 +1382,7 @@
return raw;
}
- std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const XGL_UINT32 color[4])
+ std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const uint32_t color[4])
{
std::vector<uint8_t> raw;
@@ -1498,7 +1498,7 @@
}
void test_clear_color_image(const XGL_IMAGE_CREATE_INFO &img_info,
- const XGL_FLOAT color[4],
+ const float color[4],
const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
{
Color c;
@@ -1511,7 +1511,7 @@
{
for (std::vector<xgl_testing::Device::Format>::const_iterator it = test_formats_.begin();
it != test_formats_.end(); it++) {
- const XGL_FLOAT color[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
+ const float color[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
XGL_IMAGE_CREATE_INFO img_info = xgl_testing::Image::create_info();
img_info.imageType = XGL_IMAGE_2D;
@@ -1533,7 +1533,7 @@
XglCmdClearColorImageRawTest() : XglCmdClearColorImageTest(true) {}
void test_clear_color_image_raw(const XGL_IMAGE_CREATE_INFO &img_info,
- const XGL_UINT32 color[4],
+ const uint32_t color[4],
const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
{
Color c;
@@ -1546,7 +1546,7 @@
{
for (std::vector<xgl_testing::Device::Format>::const_iterator it = test_formats_.begin();
it != test_formats_.end(); it++) {
- const XGL_UINT32 color[4] = { 0x11111111, 0x22222222, 0x33333333, 0x44444444 };
+ const uint32_t color[4] = { 0x11111111, 0x22222222, 0x33333333, 0x44444444 };
// not sure what to do here
if (it->format == XGL_FMT_UNDEFINED ||
@@ -1589,7 +1589,7 @@
ASSERT_NE(true, test_formats_.empty());
}
- std::vector<uint8_t> ds_to_raw(XGL_FORMAT format, XGL_FLOAT depth, XGL_UINT32 stencil)
+ std::vector<uint8_t> ds_to_raw(XGL_FORMAT format, float depth, uint32_t stencil)
{
std::vector<uint8_t> raw;
@@ -1607,7 +1607,7 @@
case XGL_FMT_D32_SFLOAT_S8_UINT:
{
const union {
- XGL_FLOAT depth;
+ float depth;
uint32_t u32;
} u = { depth };
@@ -1644,7 +1644,7 @@
}
void test_clear_depth_stencil(const XGL_IMAGE_CREATE_INFO &img_info,
- XGL_FLOAT depth, XGL_UINT32 stencil,
+ float depth, uint32_t stencil,
const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
{
xgl_testing::Image img;
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 9c7623a..d0af54c 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -65,7 +65,7 @@
class XglImageTest : public ::testing::Test {
public:
- void CreateImage(XGL_UINT w, XGL_UINT h);
+ void CreateImage(uint32_t w, uint32_t h);
void DestroyImage();
void CreateImageView(XGL_IMAGE_VIEW_CREATE_INFO* pCreateInfo,
@@ -77,10 +77,10 @@
xgl_testing::Device *m_device;
XGL_APPLICATION_INFO app_info;
XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT gpu_count;
+ uint32_t gpu_count;
XGL_IMAGE m_image;
XGL_GPU_MEMORY *m_image_mem;
- XGL_UINT m_num_mem;
+ uint32_t m_num_mem;
virtual void SetUp() {
XGL_RESULT err;
@@ -108,18 +108,18 @@
};
-void XglImageTest::CreateImage(XGL_UINT w, XGL_UINT h)
+void XglImageTest::CreateImage(uint32_t w, uint32_t h)
{
XGL_RESULT err;
- XGL_UINT mipCount;
- XGL_SIZE size;
+ uint32_t mipCount;
+ size_t size;
XGL_FORMAT fmt;
XGL_FORMAT_PROPERTIES image_fmt;
mipCount = 0;
- XGL_UINT _w = w;
- XGL_UINT _h = h;
+ uint32_t _w = w;
+ uint32_t _h = h;
while( ( _w > 0 ) || ( _h > 0 ) )
{
_w >>= 1;
@@ -146,13 +146,13 @@
// typedef struct _XGL_IMAGE_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure.
+ // const void* pNext; // Pointer to next structure.
// XGL_IMAGE_TYPE imageType;
// XGL_FORMAT format;
// XGL_EXTENT3D extent;
- // XGL_UINT mipLevels;
- // XGL_UINT arraySize;
- // XGL_UINT samples;
+ // uint32_t mipLevels;
+ // uint32_t arraySize;
+ // uint32_t samples;
// XGL_IMAGE_TILING tiling;
// XGL_FLAGS usage; // XGL_IMAGE_USAGE_FLAGS
// XGL_FLAGS flags; // XGL_IMAGE_CREATE_FLAGS
@@ -189,11 +189,11 @@
ASSERT_XGL_SUCCESS(err);
XGL_MEMORY_REQUIREMENTS *mem_req;
- XGL_SIZE mem_reqs_size = sizeof(XGL_MEMORY_REQUIREMENTS);
+ size_t mem_reqs_size = sizeof(XGL_MEMORY_REQUIREMENTS);
XGL_IMAGE_MEMORY_REQUIREMENTS img_reqs;
- XGL_SIZE img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
- XGL_UINT num_allocations = 0;
- XGL_SIZE num_alloc_size = sizeof(num_allocations);
+ size_t img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
+ uint32_t num_allocations = 0;
+ size_t num_alloc_size = sizeof(num_allocations);
XGL_MEMORY_ALLOC_IMAGE_INFO img_alloc = {
.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO,
.pNext = NULL,
@@ -223,7 +223,7 @@
img_alloc.formatClass = img_reqs.formatClass;
img_alloc.samples = img_reqs.samples;
- for (XGL_UINT i = 0; i < num_allocations; i ++) {
+ for (uint32_t i = 0; i < num_allocations; i ++) {
ASSERT_NE(0, mem_req[i].size) << "xglGetObjectInfo (Image): Failed - expect images to require memory";
mem_info.allocationSize = mem_req[i].size;
mem_info.memProps = XGL_MEMORY_PROPERTY_SHAREABLE_BIT;
@@ -246,7 +246,7 @@
// All done with image memory, clean up
ASSERT_XGL_SUCCESS(xglBindObjectMemory(m_image, 0, XGL_NULL_HANDLE, 0));
- for (XGL_UINT i = 0 ; i < m_num_mem; i++) {
+ for (uint32_t i = 0 ; i < m_num_mem; i++) {
err = xglFreeMemory(m_image_mem[i]);
ASSERT_XGL_SUCCESS(err);
}
@@ -278,13 +278,13 @@
// typedef struct _XGL_IMAGE_VIEW_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure
+ // const void* pNext; // Pointer to next structure
// XGL_IMAGE image;
// XGL_IMAGE_VIEW_TYPE viewType;
// XGL_FORMAT format;
// XGL_CHANNEL_MAPPING channels;
// XGL_IMAGE_SUBRESOURCE_RANGE subresourceRange;
- // XGL_FLOAT minLod;
+ // float minLod;
// } XGL_IMAGE_VIEW_CREATE_INFO;
XGL_IMAGE_VIEW_CREATE_INFO viewInfo = {};
viewInfo.sType = XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
diff --git a/tests/init.cpp b/tests/init.cpp
index aca08b8..78fcefa 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -78,9 +78,9 @@
protected:
XGL_APPLICATION_INFO app_info;
XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT gpu_count;
+ uint32_t gpu_count;
- XGL_UINT m_device_id;
+ uint32_t m_device_id;
xgl_testing::Device *m_device;
XGL_PHYSICAL_GPU_PROPERTIES props;
XGL_PHYSICAL_GPU_QUEUE_PROPERTIES queue_props;
@@ -118,12 +118,12 @@
TEST(Initialization, xglInitAndEnumerateGpus) {
XGL_APPLICATION_INFO app_info = {};
XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT gpu_count;
+ uint32_t gpu_count;
XGL_RESULT err;
xgl_testing::PhysicalGpu *gpu;
- XGL_CHAR *layers[16];
- XGL_SIZE layer_count;
- XGL_CHAR layer_buf[16][256];
+ char *layers[16];
+ size_t layer_count;
+ char layer_buf[16][256];
app_info.sType = XGL_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.pNext = NULL;
@@ -140,7 +140,7 @@
for (int i = 0; i < 16; i++)
layers[i] = &layer_buf[i][0];
- err = xglEnumerateLayers(objs[0], 16, 256, &layer_count, (XGL_CHAR * const *) layers, NULL);
+ err = xglEnumerateLayers(objs[0], 16, 256, &layer_count, (char * const *) layers, NULL);
ASSERT_XGL_SUCCESS(err);
for (int i = 0; i < layer_count; i++) {
printf("Enumerated layers: %s ", layers[i]);
@@ -158,7 +158,7 @@
XGL_RESULT err;
XGL_MEMORY_ALLOC_INFO alloc_info = {};
XGL_GPU_MEMORY gpu_mem;
- XGL_UINT8 *pData;
+ uint8_t *pData;
alloc_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
alloc_info.allocationSize = 1024 * 1024; // 1MB
@@ -173,7 +173,7 @@
err = xglAllocMemory(device(), &alloc_info, &gpu_mem);
ASSERT_XGL_SUCCESS(err);
- err = xglMapMemory(gpu_mem, 0, (XGL_VOID **) &pData);
+ err = xglMapMemory(gpu_mem, 0, (void **) &pData);
ASSERT_XGL_SUCCESS(err);
memset(pData, 0x55, alloc_info.allocationSize);
@@ -196,7 +196,7 @@
// typedef struct _XGL_EVENT_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure
+ // const void* pNext; // Pointer to next structure
// XGL_FLAGS flags; // Reserved
// } XGL_EVENT_CREATE_INFO;
memset(&event_info, 0, sizeof(event_info));
@@ -262,7 +262,7 @@
// typedef struct _XGL_FENCE_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure
+ // const void* pNext; // Pointer to next structure
// XGL_FLAGS flags; // Reserved
fence_info.sType = XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO;
@@ -277,10 +277,10 @@
// Test glxWaitForFences
// XGL_RESULT XGLAPI xglWaitForFences(
// XGL_DEVICE device,
- // XGL_UINT fenceCount,
+ // uint32_t fenceCount,
// const XGL_FENCE* pFences,
- // XGL_BOOL waitAll,
- // XGL_UINT64 timeout);
+ // bool32_t waitAll,
+ // uint64_t timeout);
err = xglWaitForFences(device(), 1, &fence, XGL_TRUE, 0);
EXPECT_EQ(XGL_ERROR_UNAVAILABLE, err);
@@ -300,7 +300,7 @@
size_t data_size;
XGL_MEMORY_REQUIREMENTS mem_req;
size_t query_result_size;
- XGL_UINT *query_result_data;
+ uint32_t *query_result_data;
XGL_RESULT err;
// typedef enum _XGL_QUERY_TYPE
@@ -317,9 +317,9 @@
// typedef struct _XGL_QUERY_POOL_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO
- // const XGL_VOID* pNext; // Pointer to next structure
+ // const void* pNext; // Pointer to next structure
// XGL_QUERY_TYPE queryType;
- // XGL_UINT slots;
+ // uint32_t slots;
// } XGL_QUERY_POOL_CREATE_INFO;
memset(&query_info, 0, sizeof(query_info));
@@ -374,7 +374,7 @@
ASSERT_XGL_SUCCESS(err);
if (query_result_size > 0) {
- query_result_data = new XGL_UINT [query_result_size];
+ query_result_data = new uint32_t [query_result_size];
err = xglGetQueryPoolResults(query_pool, 0, MAX_QUERY_SLOTS,
&query_result_size, query_result_data);
ASSERT_XGL_SUCCESS(err);
@@ -406,14 +406,14 @@
TEST_F(XglTest, Queue)
{
- XGL_UINT que_idx;
+ uint32_t que_idx;
ASSERT_NE(0, queue_props.queueCount) << "No heaps available for GPU #" << m_device_id << ": " << props.gpuName;
// XGL_RESULT XGLAPI xglGetDeviceQueue(
// XGL_DEVICE device,
// XGL_QUEUE_TYPE queueType,
-// XGL_UINT queueIndex,
+// uint32_t queueIndex,
// XGL_QUEUE* pQueue);
/*
* queue handles are retrieved from the device by calling
@@ -469,8 +469,8 @@
{
XGL_RESULT err;
XGL_IMAGE image;
- XGL_UINT w, h, mipCount;
- XGL_SIZE size;
+ uint32_t w, h, mipCount;
+ size_t size;
XGL_FORMAT fmt;
XGL_FORMAT_PROPERTIES image_fmt;
size_t data_size;
@@ -479,8 +479,8 @@
h = 256;
mipCount = 0;
- XGL_UINT _w = w;
- XGL_UINT _h = h;
+ uint32_t _w = w;
+ uint32_t _h = h;
while( ( _w > 0 ) || ( _h > 0 ) )
{
_w >>= 1;
@@ -508,13 +508,13 @@
// typedef struct _XGL_IMAGE_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO
-// const XGL_VOID* pNext; // Pointer to next structure.
+// const void* pNext; // Pointer to next structure.
// XGL_IMAGE_TYPE imageType;
// XGL_FORMAT format;
// XGL_EXTENT3D extent;
-// XGL_UINT mipLevels;
-// XGL_UINT arraySize;
-// XGL_UINT samples;
+// uint32_t mipLevels;
+// uint32_t arraySize;
+// uint32_t samples;
// XGL_IMAGE_TILING tiling;
// XGL_FLAGS usage; // XGL_IMAGE_USAGE_FLAGS
// XGL_FLAGS flags; // XGL_IMAGE_CREATE_FLAGS
@@ -555,8 +555,8 @@
// XGL_IMAGE image,
// const XGL_IMAGE_SUBRESOURCE* pSubresource,
// XGL_SUBRESOURCE_INFO_TYPE infoType,
-// XGL_SIZE* pDataSize,
-// XGL_VOID* pData);
+// size_t* pDataSize,
+// void* pData);
// typedef struct _XGL_SUBRESOURCE_LAYOUT
// {
// XGL_GPU_SIZE offset; // Specified in bytes
@@ -568,8 +568,8 @@
// typedef struct _XGL_IMAGE_SUBRESOURCE
// {
// XGL_IMAGE_ASPECT aspect;
-// XGL_UINT mipLevel;
-// XGL_UINT arraySlice;
+// uint32_t mipLevel;
+// uint32_t arraySlice;
// } XGL_IMAGE_SUBRESOURCE;
// typedef enum _XGL_SUBRESOURCE_INFO_TYPE
// {
@@ -608,7 +608,7 @@
};
XGL_MEMORY_REQUIREMENTS mem_req;
XGL_IMAGE_MEMORY_REQUIREMENTS img_reqs;
- XGL_SIZE img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
+ size_t img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
data_size = sizeof(mem_req);
err = xglGetObjectInfo(image, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
&data_size, &mem_req);
@@ -644,13 +644,13 @@
// typedef struct _XGL_IMAGE_VIEW_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO
-// const XGL_VOID* pNext; // Pointer to next structure
+// const void* pNext; // Pointer to next structure
// XGL_IMAGE image;
// XGL_IMAGE_VIEW_TYPE viewType;
// XGL_FORMAT format;
// XGL_CHANNEL_MAPPING channels;
// XGL_IMAGE_SUBRESOURCE_RANGE subresourceRange;
-// XGL_FLOAT minLod;
+// float minLod;
// } XGL_IMAGE_VIEW_CREATE_INFO;
XGL_IMAGE_VIEW_CREATE_INFO viewInfo = {};
XGL_IMAGE_VIEW view;
@@ -701,7 +701,7 @@
// typedef struct _XGL_CMD_BUFFER_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO
-// const XGL_VOID* pNext;
+// const void* pNext;
// XGL_QUEUE_TYPE queueType;
// XGL_FLAGS flags;
// } XGL_CMD_BUFFER_CREATE_INFO;
@@ -739,9 +739,9 @@
// typedef struct _XGL_SHADER_CREATE_INFO
// {
// XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_SHADER_CREATE_INFO
-// const XGL_VOID* pNext; // Pointer to next structure
-// XGL_SIZE codeSize; // Specified in bytes
-// const XGL_VOID* pCode;
+// const void* pNext; // Pointer to next structure
+// size_t codeSize; // Specified in bytes
+// const void* pCode;
// XGL_FLAGS flags; // Reserved
// } XGL_SHADER_CREATE_INFO;
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 24db85f..f92c5aa 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -80,14 +80,14 @@
#include "xglrenderframework.h"
#ifdef DEBUG_CALLBACK
-XGL_VOID XGLAPI myDbgFunc(
+void XGLAPI myDbgFunc(
XGL_DBG_MSG_TYPE msgType,
XGL_VALIDATION_LEVEL validationLevel,
XGL_BASE_OBJECT srcObject,
- XGL_SIZE location,
- XGL_INT msgCode,
- const XGL_CHAR* pMsg,
- XGL_VOID* pUserData)
+ size_t location,
+ int32_t msgCode,
+ const char* pMsg,
+ void* pUserData)
{
switch (msgType)
{
@@ -113,8 +113,8 @@
//--------------------------------------------------------------------------------------
struct Vertex
{
- XGL_FLOAT posX, posY, posZ, posW; // Position data
- XGL_FLOAT r, g, b, a; // Color
+ float posX, posY, posZ, posW; // Position data
+ float r, g, b, a; // Color
};
#define XYZ1(_x_, _y_, _z_) (_x_), (_y_), (_z_), 1.f
@@ -230,7 +230,7 @@
XGL_FORMAT m_depth_stencil_fmt;
XGL_IMAGE m_depthStencilImage;
- XGL_UINT m_num_mem;
+ uint32_t m_num_mem;
XGL_GPU_MEMORY *m_depthStencilMem;
XGL_DEPTH_STENCIL_VIEW m_depthStencilView;
XglMemoryRefManager m_memoryRefManager;
@@ -332,11 +332,11 @@
XGL_MEMORY_ALLOC_IMAGE_INFO img_alloc;
XGL_DEPTH_STENCIL_VIEW_CREATE_INFO view;
XGL_MEMORY_REQUIREMENTS *mem_reqs;
- XGL_SIZE mem_reqs_size=sizeof(XGL_MEMORY_REQUIREMENTS);
+ size_t mem_reqs_size=sizeof(XGL_MEMORY_REQUIREMENTS);
XGL_IMAGE_MEMORY_REQUIREMENTS img_reqs;
- XGL_SIZE img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
- XGL_UINT num_allocations = 0;
- XGL_SIZE num_alloc_size = sizeof(num_allocations);
+ size_t img_reqs_size = sizeof(XGL_IMAGE_MEMORY_REQUIREMENTS);
+ uint32_t num_allocations = 0;
+ size_t num_alloc_size = sizeof(num_allocations);
// Clean up default state created by framework
if (m_stateDepthStencil) xglDestroyObject(m_stateDepthStencil);
@@ -392,7 +392,7 @@
img_alloc.usage = img_reqs.usage;
img_alloc.formatClass = img_reqs.formatClass;
img_alloc.samples = img_reqs.samples;
- for (XGL_UINT i = 0; i < num_allocations; i ++) {
+ for (uint32_t i = 0; i < num_allocations; i ++) {
mem_alloc.allocationSize = mem_reqs[i].size;
/* allocate memory */
@@ -436,9 +436,9 @@
struct xgltriangle_vs_uniform {
// Must start with MVP
- XGL_FLOAT mvp[4][4];
- XGL_FLOAT position[3][4];
- XGL_FLOAT color[3][4];
+ float mvp[4][4];
+ float position[3][4];
+ float color[3][4];
};
void XglRenderTest::XGLTriangleTest(const char *vertShaderText, const char *fragShaderText, const bool rotate)
@@ -455,7 +455,7 @@
glm::mat4 Model = glm::mat4(1.0f);
glm::mat4 MVP = Projection * View * Model;
const int matrixSize = sizeof(MVP);
- const int bufSize = sizeof(xgltriangle_vs_uniform) / sizeof(XGL_FLOAT);
+ const int bufSize = sizeof(xgltriangle_vs_uniform) / sizeof(float);
memcpy(&data.mvp, &MVP[0][0], matrixSize);
static const Vertex tri_data[] =
@@ -479,7 +479,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
ASSERT_NO_FATAL_FAILURE(InitViewport());
- XglConstantBufferObj constantBuffer(m_device, bufSize*2, sizeof(XGL_FLOAT), (const void*) &data);
+ XglConstantBufferObj constantBuffer(m_device, bufSize*2, sizeof(float), (const void*) &data);
XglShaderObj vs(m_device,vertShaderText,XGL_SHADER_STAGE_VERTEX, this);
XglShaderObj ps(m_device,fragShaderText, XGL_SHADER_STAGE_FRAGMENT, this);
@@ -502,7 +502,7 @@
cmdBuffer.BindVertexBuffer(&constantBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -519,12 +519,12 @@
RotateTriangleVSUniform(Projection, View, Model, &constantBuffer, &cmdBuffer);
#ifdef PRINT_OBJECTS
- //XGL_UINT64 objTrackGetObjectCount(XGL_OBJECT_TYPE type)
- OBJ_TRACK_GET_OBJECT_COUNT pObjTrackGetObjectCount = (OBJ_TRACK_GET_OBJECT_COUNT)xglGetProcAddr(gpu(), (XGL_CHAR*)"objTrackGetObjectCount");
- XGL_UINT64 numObjects = pObjTrackGetObjectCount(XGL_OBJECT_TYPE_ANY);
- //OBJ_TRACK_GET_OBJECTS pGetObjsFunc = xglGetProcAddr(gpu(), (XGL_CHAR*)"objTrackGetObjects");
+ //uint64_t objTrackGetObjectCount(XGL_OBJECT_TYPE type)
+ OBJ_TRACK_GET_OBJECT_COUNT pObjTrackGetObjectCount = (OBJ_TRACK_GET_OBJECT_COUNT)xglGetProcAddr(gpu(), (char*)"objTrackGetObjectCount");
+ uint64_t numObjects = pObjTrackGetObjectCount(XGL_OBJECT_TYPE_ANY);
+ //OBJ_TRACK_GET_OBJECTS pGetObjsFunc = xglGetProcAddr(gpu(), (char*)"objTrackGetObjects");
printf("DEBUG : Number of Objects : %lu\n", numObjects);
- OBJ_TRACK_GET_OBJECTS pObjTrackGetObjs = (OBJ_TRACK_GET_OBJECTS)xglGetProcAddr(gpu(), (XGL_CHAR*)"objTrackGetObjects");
+ OBJ_TRACK_GET_OBJECTS pObjTrackGetObjs = (OBJ_TRACK_GET_OBJECTS)xglGetProcAddr(gpu(), (char*)"objTrackGetObjects");
OBJTRACK_NODE* pObjNodeArray = (OBJTRACK_NODE*)malloc(sizeof(OBJTRACK_NODE)*numObjects);
pObjTrackGetObjs(XGL_OBJECT_TYPE_ANY, numObjects, pObjNodeArray);
for (i=0; i < numObjects; i++) {
@@ -825,7 +825,7 @@
" gl_FragData[0] = vec4(1.0, 0.0, 0.0, 1.0);\n"
" gl_FragData[1] = vec4(0.0, 1.0, 0.0, 1.0);\n"
"}\n";
- const XGL_FLOAT vb_data[][2] = {
+ const float vb_data[][2] = {
{ -1.0f, -1.0f },
{ 1.0f, -1.0f },
{ -1.0f, 1.0f }
@@ -880,7 +880,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -980,7 +980,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
@@ -1076,7 +1076,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1168,7 +1168,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1270,7 +1270,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1362,7 +1362,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1436,7 +1436,7 @@
// cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1511,7 +1511,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1598,7 +1598,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1689,7 +1689,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1743,7 +1743,7 @@
XglConstantBufferObj meshBuffer(m_device,sizeof(g_vb_solid_face_colors_Data)/sizeof(g_vb_solid_face_colors_Data[0]),
sizeof(g_vb_solid_face_colors_Data[0]), g_vb_solid_face_colors_Data);
- const int buf_size = sizeof(MVP) / sizeof(XGL_FLOAT);
+ const int buf_size = sizeof(MVP) / sizeof(float);
XglConstantBufferObj MVPBuffer(m_device, buf_size, sizeof(MVP[0]), (const void*) &MVP[0][0]);
XglShaderObj vs(m_device,vertShaderText,XGL_SHADER_STAGE_VERTEX, this);
@@ -1800,7 +1800,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1869,7 +1869,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -1941,7 +1941,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2024,7 +2024,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2096,7 +2096,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2189,7 +2189,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2272,7 +2272,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2374,7 +2374,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2471,7 +2471,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2537,7 +2537,7 @@
sizeof(g_vb_solid_face_colors_Data[0]), g_vb_solid_face_colors_Data);
meshBuffer.BufferMemoryBarrier();
- const int buf_size = sizeof(MVP) / sizeof(XGL_FLOAT);
+ const int buf_size = sizeof(MVP) / sizeof(float);
XglConstantBufferObj mvpBuffer(m_device, buf_size, sizeof(MVP[0]), (const void*) &MVP[0][0]);
XglShaderObj vs(m_device,vertShaderText,XGL_SHADER_STAGE_VERTEX, this);
@@ -2598,7 +2598,7 @@
cmdBuffer.BindVertexBuffer(&meshBuffer, 0, 0);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2719,7 +2719,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -2835,7 +2835,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
@@ -3087,7 +3087,7 @@
GenericDrawPreparation(&cmdBuffer, &pipelineobj, &descriptorSet);
#ifdef DUMP_STATE_DOT
- DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (XGL_CHAR*)"drawStateDumpDotFile");
+ DRAW_STATE_DUMP_DOT_FILE pDSDumpDot = (DRAW_STATE_DUMP_DOT_FILE)xglGetProcAddr(gpu(), (char*)"drawStateDumpDotFile");
pDSDumpDot((char*)"triTest2.dot");
#endif
// render triangle
diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 3c452c5..aaff412 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -145,7 +145,7 @@
void XglRenderFramework::InitRenderTarget()
{
- XGL_UINT i;
+ uint32_t i;
for (i = 0; i < m_renderTargetCount; i++) {
XglImage *img = new XglImage(m_device);
@@ -171,8 +171,8 @@
.pColorAttachments = m_colorBindings,
.pDepthStencilAttachment = dsBinding,
.sampleCount = 1,
- .width = (XGL_UINT)m_width,
- .height = (XGL_UINT)m_height,
+ .width = (uint32_t)m_width,
+ .height = (uint32_t)m_height,
.layers = 1,
};
XGL_RENDER_PASS_CREATE_INFO rp_info;
@@ -190,7 +190,7 @@
xglCreateRenderPass(device(), &rp_info, &m_renderPass);
}
-XglDevice::XglDevice(XGL_UINT id, XGL_PHYSICAL_GPU obj) :
+XglDevice::XglDevice(uint32_t id, XGL_PHYSICAL_GPU obj) :
xgl_testing::Device(obj), id(id)
{
init();
@@ -338,16 +338,16 @@
m_imageInfo.layout = XGL_IMAGE_LAYOUT_GENERAL;
}
-void XglImage::init(XGL_UINT32 w, XGL_UINT32 h,
+void XglImage::init(uint32_t w, uint32_t h,
XGL_FORMAT fmt, XGL_FLAGS usage,
XGL_IMAGE_TILING tiling)
{
- XGL_UINT mipCount;
+ uint32_t mipCount;
mipCount = 0;
- XGL_UINT _w = w;
- XGL_UINT _h = h;
+ uint32_t _w = w;
+ uint32_t _h = h;
while( ( _w > 0 ) || ( _h > 0 ) )
{
_w >>= 1;
@@ -382,7 +382,7 @@
m_targetView.init(*m_device, createView);
}
-XGL_RESULT XglImage::MapMemory(XGL_VOID** ptr)
+XGL_RESULT XglImage::MapMemory(void** ptr)
{
*ptr = map();
return (*ptr) ? XGL_SUCCESS : XGL_ERROR_UNKNOWN;
@@ -446,8 +446,8 @@
subresource_layout(subresource(XGL_IMAGE_ASPECT_COLOR, 0, 0));
m_rowPitch = layout.rowPitch;
- XGL_VOID *data;
- XGL_INT x, y;
+ void *data;
+ int32_t x, y;
data = map();
@@ -466,7 +466,7 @@
void XglTextureObj::ChangeColors(uint32_t color1, uint32_t color2)
{
const uint32_t tex_colors[2] = { color1, color2 };
- XGL_VOID *data;
+ void *data;
data = map();
@@ -542,7 +542,7 @@
this->m_bufferViewInfo.view = m_bufferView.obj();
}
-void XglConstantBufferObj::Bind(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_SIZE offset, XGL_UINT binding)
+void XglConstantBufferObj::Bind(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_SIZE offset, uint32_t binding)
{
xglCmdBindVertexBuffer(cmdBuffer, obj(), offset, binding);
}
@@ -608,7 +608,7 @@
err = m_commandBuffer->EndCommandBuffer();
ASSERT_XGL_SUCCESS(err);
- XGL_UINT32 numMemRefs=1;
+ uint32_t numMemRefs=1;
XGL_MEMORY_REF memRefs;
// this command buffer only uses the vertex buffer memory
memRefs.flags = 0;
@@ -825,7 +825,7 @@
m_vertexBufferCount++;
}
-void XglPipelineObj::AddColorAttachment(XGL_UINT binding, const XGL_PIPELINE_CB_ATTACHMENT_STATE *att)
+void XglPipelineObj::AddColorAttachment(uint32_t binding, const XGL_PIPELINE_CB_ATTACHMENT_STATE *att)
{
if (binding+1 > m_colorAttachments.size())
{
@@ -848,7 +848,7 @@
void XglPipelineObj::CreateXGLPipeline(XglDescriptorSetObj *descriptorSet)
{
- XGL_VOID* head_ptr = &m_ds_state;
+ void* head_ptr = &m_ds_state;
XGL_GRAPHICS_PIPELINE_CREATE_INFO info = {};
XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* shaderCreateInfo;
@@ -885,7 +885,7 @@
void XglPipelineObj::BindPipelineCommandBuffer(XGL_CMD_BUFFER m_cmdBuffer, XglDescriptorSetObj *descriptorSet)
{
- XGL_VOID* head_ptr = &m_ds_state;
+ void* head_ptr = &m_ds_state;
XGL_GRAPHICS_PIPELINE_CREATE_INFO info = {};
XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* shaderCreateInfo;
@@ -939,7 +939,7 @@
XGL_MEMORY_REF* XglMemoryRefManager::GetMemoryRefList() {
XGL_MEMORY_REF *localRefs;
- XGL_UINT32 numRefs=m_bufferObjs.size();
+ uint32_t numRefs=m_bufferObjs.size();
if (numRefs <= 0)
return NULL;
@@ -999,7 +999,7 @@
void XglCommandBufferObj::ClearAllBuffers(XGL_DEPTH_STENCIL_BIND_INFO *depthStencilBinding, XGL_IMAGE depthStencilImage)
{
- XGL_UINT i;
+ uint32_t i;
const XGL_FLAGS output_mask =
XGL_MEMORY_OUTPUT_CPU_WRITE_BIT |
XGL_MEMORY_OUTPUT_SHADER_WRITE_BIT |
@@ -1033,7 +1033,7 @@
pipeline_barrier.pMemBarriers = &memory_barrier;
// clear the back buffer to dark grey
- XGL_UINT clearColor[4] = {64, 64, 64, 0};
+ uint32_t clearColor[4] = {64, 64, 64, 0};
for (i = 0; i < m_renderTargetCount; i++) {
memory_barrier.image = m_renderTargets[i]->image();
@@ -1077,7 +1077,7 @@
void XglCommandBufferObj::PrepareAttachments()
{
- XGL_UINT i;
+ uint32_t i;
const XGL_FLAGS output_mask =
XGL_MEMORY_OUTPUT_CPU_WRITE_BIT |
XGL_MEMORY_OUTPUT_SHADER_WRITE_BIT |
@@ -1138,17 +1138,17 @@
m_renderTargetCount++;
}
-void XglCommandBufferObj::DrawIndexed(XGL_UINT firstIndex, XGL_UINT indexCount, XGL_INT vertexOffset, XGL_UINT firstInstance, XGL_UINT instanceCount)
+void XglCommandBufferObj::DrawIndexed(uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount)
{
xglCmdDrawIndexed(obj(), firstIndex, indexCount, vertexOffset, firstInstance, instanceCount);
}
-void XglCommandBufferObj::Draw(XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount)
+void XglCommandBufferObj::Draw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount)
{
xglCmdDraw(obj(), firstVertex, vertexCount, firstInstance, instanceCount);
}
-void XglCommandBufferObj::QueueCommandBuffer(XGL_MEMORY_REF *memRefs, XGL_UINT32 numMemRefs)
+void XglCommandBufferObj::QueueCommandBuffer(XGL_MEMORY_REF *memRefs, uint32_t numMemRefs)
{
XGL_RESULT err = XGL_SUCCESS;
@@ -1173,11 +1173,11 @@
// bind pipeline, vertex buffer (descriptor set) and WVP (dynamic buffer view)
xglCmdBindDescriptorSet(obj(), XGL_PIPELINE_BIND_POINT_GRAPHICS, descriptorSet, NULL );
}
-void XglCommandBufferObj::BindIndexBuffer(XglIndexBufferObj *indexBuffer, XGL_UINT offset)
+void XglCommandBufferObj::BindIndexBuffer(XglIndexBufferObj *indexBuffer, uint32_t offset)
{
xglCmdBindIndexBuffer(obj(), indexBuffer->obj(), offset, indexBuffer->GetIndexType());
}
-void XglCommandBufferObj::BindVertexBuffer(XglConstantBufferObj *vertexBuffer, XGL_UINT offset, XGL_UINT binding)
+void XglCommandBufferObj::BindVertexBuffer(XglConstantBufferObj *vertexBuffer, uint32_t offset, uint32_t binding)
{
xglCmdBindVertexBuffer(obj(), vertexBuffer->obj(), offset, binding);
}
diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index dca4288..21a03e5 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -33,12 +33,12 @@
class XglDevice : public xgl_testing::Device
{
public:
- XglDevice(XGL_UINT id, XGL_PHYSICAL_GPU obj);
+ XglDevice(uint32_t id, XGL_PHYSICAL_GPU obj);
XGL_DEVICE device() { return obj(); }
void get_device_queue();
- XGL_UINT id;
+ uint32_t id;
XGL_PHYSICAL_GPU_PROPERTIES props;
const XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *queue_props;
@@ -66,7 +66,7 @@
protected:
XGL_APPLICATION_INFO app_info;
XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
- XGL_UINT gpu_count;
+ uint32_t gpu_count;
XglDevice *m_device;
XGL_CMD_BUFFER m_cmdBuffer;
XGL_RENDER_PASS m_renderPass;
@@ -76,8 +76,8 @@
XGL_DYNAMIC_VP_STATE_OBJECT m_stateViewport;
XGL_DYNAMIC_DS_STATE_OBJECT m_stateDepthStencil;
vector<XglImage*> m_renderTargets;
- XGL_UINT m_renderTargetCount;
- XGL_FLOAT m_width, m_height;
+ uint32_t m_renderTargetCount;
+ float m_width, m_height;
XGL_FORMAT m_render_target_fmt;
XGL_COLOR_ATTACHMENT_BIND_INFO m_colorBindings[8];
XGL_DEPTH_STENCIL_BIND_INFO m_depthStencilBinding;
@@ -123,17 +123,17 @@
void PrepareAttachments();
void BindPipeline(XGL_PIPELINE pipeline);
void BindDescriptorSet(XGL_DESCRIPTOR_SET descriptorSet);
- void BindVertexBuffer(XglConstantBufferObj *vertexBuffer, XGL_UINT offset, XGL_UINT binding);
- void BindIndexBuffer(XglIndexBufferObj *indexBuffer, XGL_UINT offset);
+ void BindVertexBuffer(XglConstantBufferObj *vertexBuffer, uint32_t offset, uint32_t binding);
+ void BindIndexBuffer(XglIndexBufferObj *indexBuffer, uint32_t offset);
void BindStateObject(XGL_STATE_BIND_POINT stateBindPoint, XGL_DYNAMIC_STATE_OBJECT stateObject);
- void Draw(XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount);
- void DrawIndexed(XGL_UINT firstIndex, XGL_UINT indexCount, XGL_INT vertexOffset, XGL_UINT firstInstance, XGL_UINT instanceCount);
- void QueueCommandBuffer(XGL_MEMORY_REF *memRefs, XGL_UINT32 numMemRefs);
+ void Draw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount);
+ void DrawIndexed(uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount);
+ void QueueCommandBuffer(XGL_MEMORY_REF *memRefs, uint32_t numMemRefs);
protected:
XglDevice *m_device;
vector<XglImage*> m_renderTargets;
- XGL_UINT m_renderTargetCount;
+ uint32_t m_renderTargetCount;
};
@@ -160,7 +160,7 @@
XGL_MEMORY_INPUT_DEPTH_STENCIL_ATTACHMENT_BIT |
XGL_MEMORY_INPUT_COPY_BIT);
- void Bind(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_SIZE offset, XGL_UINT binding);
+ void Bind(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_SIZE offset, uint32_t binding);
XGL_BUFFER_VIEW_ATTACH_INFO m_bufferViewInfo;
@@ -191,11 +191,11 @@
XglImage(XglDevice *dev);
public:
- void init( XGL_UINT32 w, XGL_UINT32 h,
+ void init( uint32_t w, uint32_t h,
XGL_FORMAT fmt, XGL_FLAGS usage,
XGL_IMAGE_TILING tiling=XGL_LINEAR_TILING);
- // void clear( CommandBuffer*, XGL_UINT[4] );
+ // void clear( CommandBuffer*, uint32_t[4] );
// void prepare( CommandBuffer*, XGL_IMAGE_STATE );
void layout( XGL_IMAGE_LAYOUT layout )
@@ -222,16 +222,16 @@
{
return ( XGL_IMAGE_LAYOUT )m_imageInfo.layout;
}
- XGL_UINT32 width() const
+ uint32_t width() const
{
return extent().width;
}
- XGL_UINT32 height() const
+ uint32_t height() const
{
return extent().height;
}
- XGL_RESULT MapMemory(XGL_VOID** ptr);
+ XGL_RESULT MapMemory(void** ptr);
XGL_RESULT UnmapMemory();
protected:
@@ -316,7 +316,7 @@
void AddVertexInputAttribs(XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION* vi_attrib, int count);
void AddVertexInputBindings(XGL_VERTEX_INPUT_BINDING_DESCRIPTION* vi_binding, int count);
void AddVertexDataBuffer(XglConstantBufferObj* vertexDataBuffer, int binding);
- void AddColorAttachment(XGL_UINT binding, const XGL_PIPELINE_CB_ATTACHMENT_STATE *att);
+ void AddColorAttachment(uint32_t binding, const XGL_PIPELINE_CB_ATTACHMENT_STATE *att);
void SetDepthStencil(XGL_PIPELINE_DS_STATE_CREATE_INFO *);
void CreateXGLPipeline(XglDescriptorSetObj *descriptorSet);
XGL_PIPELINE GetPipelineHandle();
diff --git a/tests/xgltestbinding.cpp b/tests/xgltestbinding.cpp
index c1864a2..8fe3e78 100644
--- a/tests/xgltestbinding.cpp
+++ b/tests/xgltestbinding.cpp
@@ -189,8 +189,8 @@
std::vector<XGL_MEMORY_REQUIREMENTS> BaseObject::memory_requirements() const
{
XGL_RESULT err;
- XGL_UINT num_allocations = 0;
- XGL_SIZE num_alloc_size = sizeof(num_allocations);
+ uint32_t num_allocations = 0;
+ size_t num_alloc_size = sizeof(num_allocations);
err = xglGetObjectInfo(obj_, XGL_INFO_TYPE_MEMORY_ALLOCATION_COUNT,
&num_alloc_size, &num_allocations);
EXPECT(err == XGL_SUCCESS && num_alloc_size == sizeof(num_allocations));
diff --git a/tests/xgltestbinding.h b/tests/xgltestbinding.h
index e8cd76a..a47b44a 100644
--- a/tests/xgltestbinding.h
+++ b/tests/xgltestbinding.h
@@ -623,7 +623,7 @@
XGL_MEMORY_ALLOC_INFO info = {};
info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
if (next_info != NULL)
- info.pNext = (XGL_VOID *) next_info;
+ info.pNext = (void *) next_info;
info.allocationSize = reqs.size;
info.memProps = reqs.memProps;
diff --git a/tests/xgltestframework.cpp b/tests/xgltestframework.cpp
index f272245..54212bb 100644
--- a/tests/xgltestframework.cpp
+++ b/tests/xgltestframework.cpp
@@ -227,7 +227,7 @@
const char *ptr;
- err = xglMapMemory( image->memory(), 0, (XGL_VOID **) &ptr );
+ err = xglMapMemory( image->memory(), 0, (void **) &ptr );
ASSERT_XGL_SUCCESS( err );
ptr += sr_layout.offset;
@@ -346,7 +346,7 @@
const char *ptr;
- err = image->MapMemory( (XGL_VOID **) &ptr );
+ err = image->MapMemory( (void **) &ptr );
ASSERT_XGL_SUCCESS( err );
ptr += sr_layout.offset;
diff --git a/xgl-generate.py b/xgl-generate.py
index a0f7992..e107d0f 100755
--- a/xgl-generate.py
+++ b/xgl-generate.py
@@ -176,7 +176,7 @@
"}" % (qual, decl, proto.params[0].name, proto.params[1].name,
proto.params[0].name, proto.params[1].name, stmt))
elif proto.params[0].ty != "XGL_PHYSICAL_GPU":
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
stmt = "return " + stmt
funcs.append("%s%s\n"
"{\n"
@@ -185,7 +185,7 @@
" %s;\n"
"}" % (qual, decl, proto.params[0].name, stmt))
else:
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
stmt = "return " + stmt
funcs.append("%s%s\n"
"{\n"
@@ -290,7 +290,7 @@
stubs = []
for proto in self.protos:
decl = self._generate_stub_decl(proto)
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
stmt = " return XGL_ERROR_UNKNOWN;\n"
else:
stmt = ""
diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py
index 85c4a81..ae95238 100755
--- a/xgl-layer-generate.py
+++ b/xgl-layer-generate.py
@@ -99,7 +99,7 @@
# TODO : Need ENUM and STRUCT checks here
if "_TYPE" in xgl_type: # TODO : This should be generic ENUM check
return ("%s", "string_%s(%s)" % (xgl_type.strip('const ').strip('*'), name))
- if "XGL_CHAR*" == xgl_type:
+ if "char*" == xgl_type:
return ("%s", name)
if "UINT64" in xgl_type:
if '*' in xgl_type:
@@ -139,13 +139,13 @@
cbh_body.append('static XGL_LAYER_DBG_FUNCTION_NODE *pDbgFunctionHead = NULL;')
cbh_body.append('// Utility function to handle reporting')
cbh_body.append('// If callbacks are enabled, use them, otherwise use printf')
- cbh_body.append('static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType,')
+ cbh_body.append('static void layerCbMsg(XGL_DBG_MSG_TYPE msgType,')
cbh_body.append(' XGL_VALIDATION_LEVEL validationLevel,')
cbh_body.append(' XGL_BASE_OBJECT srcObject,')
- cbh_body.append(' XGL_SIZE location,')
- cbh_body.append(' XGL_INT msgCode,')
- cbh_body.append(' const XGL_CHAR* pLayerPrefix,')
- cbh_body.append(' const XGL_CHAR* pMsg)')
+ cbh_body.append(' size_t location,')
+ cbh_body.append(' int32_t msgCode,')
+ cbh_body.append(' const char* pLayerPrefix,')
+ cbh_body.append(' const char* pMsg)')
cbh_body.append('{')
cbh_body.append(' XGL_LAYER_DBG_FUNCTION_NODE *pTrav = pDbgFunctionHead;')
cbh_body.append(' if (pTrav) {')
@@ -175,7 +175,7 @@
def _gen_layer_dbg_callback_register(self):
r_body = []
- r_body.append('XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData)')
+ r_body.append('XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData)')
r_body.append('{')
r_body.append(' // This layer intercepts callbacks')
r_body.append(' XGL_LAYER_DBG_FUNCTION_NODE *pNewDbgFuncNode = (XGL_LAYER_DBG_FUNCTION_NODE*)malloc(sizeof(XGL_LAYER_DBG_FUNCTION_NODE));')
@@ -229,7 +229,7 @@
param0_name = proto.params[0].name
ret_val = ''
stmt = ''
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
ret_val = "XGL_RESULT result = "
stmt = " return result;\n"
if proto.name == "EnumerateLayers":
@@ -240,12 +240,12 @@
' if (gpu != NULL) {\n'
' XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) %s;\n'
' sprintf(str, "At start of layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpu, 0, 0, (XGL_CHAR *) "GENERIC", (XGL_CHAR *) str);\n'
+ ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpu, 0, 0, (char *) "GENERIC", (char *) str);\n'
' pCurObj = gpuw;\n'
' pthread_once(&tabOnce, initLayerTable);\n'
' %snextTable.%s;\n'
' sprintf(str, "Completed layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpu, 0, 0, (XGL_CHAR *) "GENERIC", (XGL_CHAR *) str);\n'
+ ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpu, 0, 0, (char *) "GENERIC", (char *) str);\n'
' fflush(stdout);\n'
' %s'
' } else {\n'
@@ -274,12 +274,12 @@
' char str[1024];'
' XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) %s;\n'
' sprintf(str, "At start of layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, (XGL_CHAR *) "GENERIC", (XGL_CHAR *) str);\n'
+ ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, (char *) "GENERIC", (char *) str);\n'
' pCurObj = gpuw;\n'
' pthread_once(&tabOnce, initLayerTable);\n'
' %snextTable.%s;\n'
' sprintf(str, "Completed layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, (XGL_CHAR *) "GENERIC", (XGL_CHAR *) str);\n'
+ ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, (char *) "GENERIC", (char *) str);\n'
' fflush(stdout);\n'
'%s'
'}' % (qual, decl, proto.params[0].name, proto.name, ret_val, c_call, proto.name, stmt))
@@ -294,7 +294,7 @@
create_params = -2
elif 'Create' in proto.name or 'Alloc' in proto.name or 'MapMemory' in proto.name:
create_params = -1
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
ret_val = "XGL_RESULT result = "
stmt = " return result;\n"
f_open = ''
@@ -325,12 +325,12 @@
log_func += '%s = " << %s << ", ' % (p.name, pfi)
#print_vals += ', %s' % (pfi)
# TODO : Just want this to be simple check for params of STRUCT type
- if "pCreateInfo" in p.name or ('const' in p.ty and '*' in p.ty and False not in [tmp_ty not in p.ty for tmp_ty in ['XGL_CHAR', 'XGL_VOID', 'XGL_CMD_BUFFER', 'XGL_QUEUE_SEMAPHORE', 'XGL_FENCE', 'XGL_SAMPLER', 'XGL_UINT32']]):
+ if "pCreateInfo" in p.name or ('const' in p.ty and '*' in p.ty and False not in [tmp_ty not in p.ty for tmp_ty in ['char', 'void', 'XGL_CMD_BUFFER', 'XGL_QUEUE_SEMAPHORE', 'XGL_FENCE', 'XGL_SAMPLER', 'uint32_t']]):
if 'Wsi' not in proto.name:
cis_param_index.append(pindex)
pindex += 1
log_func = log_func.strip(', ')
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
log_func += ') = " << string_XGL_RESULT(result) << "\\n"'
#print_vals += ', string_XGL_RESULT(result)'
else:
@@ -405,7 +405,7 @@
create_params = -2
elif 'Create' in proto.name or 'Alloc' in proto.name or 'MapMemory' in proto.name:
create_params = -1
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
ret_val = "XGL_RESULT result = "
stmt = " return result;\n"
f_open = ''
@@ -451,7 +451,7 @@
else:
prev_count_name = ''
log_func = log_func.strip(', ')
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
log_func += ') = %s\\n"'
print_vals += ', string_XGL_RESULT(result)'
else:
@@ -598,15 +598,15 @@
elif 'GlobalOption' in proto.name:
using_line = ''
else:
- using_line = ' ll_increment_use_count((XGL_VOID*)%s, %s);\n' % (param0_name, obj_type_mapping[p0_type])
+ using_line = ' ll_increment_use_count((void*)%s, %s);\n' % (param0_name, obj_type_mapping[p0_type])
if 'Create' in proto.name or 'Alloc' in proto.name:
- create_line = ' ll_insert_obj((XGL_VOID*)*%s, %s);\n' % (proto.params[-1].name, obj_type_mapping[proto.params[-1].ty.strip('*')])
+ create_line = ' ll_insert_obj((void*)*%s, %s);\n' % (proto.params[-1].name, obj_type_mapping[proto.params[-1].ty.strip('*')])
if 'DestroyObject' in proto.name:
- destroy_line = ' ll_destroy_obj((XGL_VOID*)%s);\n' % (param0_name)
+ destroy_line = ' ll_destroy_obj((void*)%s);\n' % (param0_name)
using_line = ''
else:
if 'Destroy' in proto.name or 'Free' in proto.name:
- destroy_line = ' ll_remove_obj_type((XGL_VOID*)%s, %s);\n' % (param0_name, obj_type_mapping[p0_type])
+ destroy_line = ' ll_remove_obj_type((void*)%s, %s);\n' % (param0_name, obj_type_mapping[p0_type])
using_line = ''
if 'DestroyDevice' in proto.name:
destroy_line += ' // Report any remaining objects in LL\n objNode *pTrav = pGlobalHead;\n while (pTrav) {\n'
@@ -616,7 +616,7 @@
destroy_line += ' pTrav = pTrav->pNextGlobal;\n }\n'
ret_val = ''
stmt = ''
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
ret_val = "XGL_RESULT result = "
stmt = " return result;\n"
if proto.name == "EnumerateLayers":
@@ -713,7 +713,7 @@
prev_count_name = p.name
else:
prev_count_name = ''
- if proto.ret != "XGL_VOID":
+ if proto.ret != "void":
ret_val = "XGL_RESULT result = "
stmt = " return result;\n"
if proto.name == "EnumerateLayers":
@@ -768,17 +768,17 @@
def _generate_extensions(self):
exts = []
- exts.append('XGL_UINT64 objTrackGetObjectCount(XGL_OBJECT_TYPE type)')
+ exts.append('uint64_t objTrackGetObjectCount(XGL_OBJECT_TYPE type)')
exts.append('{')
exts.append(' return (type == XGL_OBJECT_TYPE_ANY) ? numTotalObjs : numObjs[type];')
exts.append('}')
exts.append('')
- exts.append('XGL_RESULT objTrackGetObjects(XGL_OBJECT_TYPE type, XGL_UINT64 objCount, OBJTRACK_NODE* pObjNodeArray)')
+ exts.append('XGL_RESULT objTrackGetObjects(XGL_OBJECT_TYPE type, uint64_t objCount, OBJTRACK_NODE* pObjNodeArray)')
exts.append('{')
exts.append(" // This bool flags if we're pulling all objs or just a single class of objs")
- exts.append(' XGL_BOOL bAllObjs = (type == XGL_OBJECT_TYPE_ANY);')
+ exts.append(' bool32_t bAllObjs = (type == XGL_OBJECT_TYPE_ANY);')
exts.append(' // Check the count first thing')
- exts.append(' XGL_UINT64 maxObjCount = (bAllObjs) ? numTotalObjs : numObjs[type];')
+ exts.append(' uint64_t maxObjCount = (bAllObjs) ? numTotalObjs : numObjs[type];')
exts.append(' if (objCount > maxObjCount) {')
exts.append(' char str[1024];')
exts.append(' sprintf(str, "OBJ ERROR : Received objTrackGetObjects() request for %lu objs, but there are only %lu objs of type %s", objCount, maxObjCount, string_XGL_OBJECT_TYPE(type));')
@@ -786,7 +786,7 @@
exts.append(' return XGL_ERROR_INVALID_VALUE;')
exts.append(' }')
exts.append(' objNode* pTrav = (bAllObjs) ? pGlobalHead : pObjectHead[type];')
- exts.append(' for (XGL_UINT64 i = 0; i < objCount; i++) {')
+ exts.append(' for (uint64_t i = 0; i < objCount; i++) {')
exts.append(' if (!pTrav) {')
exts.append(' char str[1024];')
exts.append(' sprintf(str, "OBJ INTERNAL ERROR : Ran out of %s objs! Should have %lu, but only copied %lu and not the requested %lu.", string_XGL_OBJECT_TYPE(type), maxObjCount, i, objCount);')
@@ -803,7 +803,7 @@
def _generate_layer_gpa_function(self, extensions=[]):
func_body = ["#include \"xgl_generic_intercept_proc_helper.h\""]
- func_body.append("XGL_LAYER_EXPORT XGL_VOID* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* funcName)\n"
+ func_body.append("XGL_LAYER_EXPORT void* XGLAPI xglGetProcAddr(XGL_PHYSICAL_GPU gpu, const char* funcName)\n"
"{\n"
" XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) gpu;\n"
" void* addr;\n"
@@ -1025,11 +1025,11 @@
header_txt.append('static XGL_LAYER_DBG_FUNCTION_NODE *pDbgFunctionHead = NULL;')
header_txt.append('// Utility function to handle reporting')
header_txt.append('// If callbacks are enabled, use them, otherwise use printf')
- header_txt.append('static XGL_VOID layerCbMsg(XGL_DBG_MSG_TYPE msgType,')
+ header_txt.append('static void layerCbMsg(XGL_DBG_MSG_TYPE msgType,')
header_txt.append(' XGL_VALIDATION_LEVEL validationLevel,')
header_txt.append(' XGL_BASE_OBJECT srcObject,')
- header_txt.append(' XGL_SIZE location,')
- header_txt.append(' XGL_INT msgCode,')
+ header_txt.append(' size_t location,')
+ header_txt.append(' int32_t msgCode,')
header_txt.append(' const char* pLayerPrefix,')
header_txt.append(' const char* pMsg)')
header_txt.append('{')
@@ -1089,7 +1089,7 @@
header_txt.append(' }')
header_txt.append(' }')
header_txt.append('}')
- header_txt.append('static void ll_insert_obj(XGL_VOID* pObj, XGL_OBJECT_TYPE objType) {')
+ header_txt.append('static void ll_insert_obj(void* pObj, XGL_OBJECT_TYPE objType) {')
header_txt.append(' char str[1024];')
header_txt.append(' sprintf(str, "OBJ[%llu] : CREATE %s object %p", object_track_index++, string_XGL_OBJECT_TYPE(objType), (void*)pObj);')
header_txt.append(' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pObj, 0, OBJTRACK_NONE, "OBJTRACK", str);')
@@ -1123,7 +1123,7 @@
header_txt.append(' return XGL_OBJECT_TYPE_UNKNOWN;')
header_txt.append('}')
header_txt.append('#if 0')
- header_txt.append('static uint64_t ll_get_obj_uses(XGL_VOID* pObj, XGL_OBJECT_TYPE objType) {')
+ header_txt.append('static uint64_t ll_get_obj_uses(void* pObj, XGL_OBJECT_TYPE objType) {')
header_txt.append(' objNode *pTrav = pObjectHead[objType];')
header_txt.append(' while (pTrav) {')
header_txt.append(' if (pTrav->obj.pObj == pObj) {')
@@ -1134,7 +1134,7 @@
header_txt.append(' return 0;')
header_txt.append('}')
header_txt.append('#endif')
- header_txt.append('static void ll_increment_use_count(XGL_VOID* pObj, XGL_OBJECT_TYPE objType) {')
+ header_txt.append('static void ll_increment_use_count(void* pObj, XGL_OBJECT_TYPE objType) {')
header_txt.append(' objNode *pTrav = pObjectHead[objType];')
header_txt.append(' while (pTrav) {')
header_txt.append(' if (pTrav->obj.pObj == pObj) {')
@@ -1157,7 +1157,7 @@
header_txt.append('// We usually do not know Obj type when we destroy it so have to fetch')
header_txt.append('// Type from global list w/ ll_destroy_obj()')
header_txt.append('// and then do the full removal from both lists w/ ll_remove_obj_type()')
- header_txt.append('static void ll_remove_obj_type(XGL_VOID* pObj, XGL_OBJECT_TYPE objType) {')
+ header_txt.append('static void ll_remove_obj_type(void* pObj, XGL_OBJECT_TYPE objType) {')
header_txt.append(' objNode *pTrav = pObjectHead[objType];')
header_txt.append(' objNode *pPrev = pObjectHead[objType];')
header_txt.append(' while (pTrav) {')
@@ -1182,7 +1182,7 @@
header_txt.append('}')
header_txt.append('// Parse global list to find obj type, then remove obj from obj type list, finally')
header_txt.append('// remove obj from global list')
- header_txt.append('static void ll_destroy_obj(XGL_VOID* pObj) {')
+ header_txt.append('static void ll_destroy_obj(void* pObj) {')
header_txt.append(' objNode *pTrav = pGlobalHead;')
header_txt.append(' objNode *pPrev = pGlobalHead;')
header_txt.append(' while (pTrav) {')
diff --git a/xgl.py b/xgl.py
index d072877..22baba5 100644
--- a/xgl.py
+++ b/xgl.py
@@ -219,19 +219,19 @@
Proto("XGL_RESULT", "InitAndEnumerateGpus",
[Param("const XGL_APPLICATION_INFO*", "pAppInfo"),
Param("const XGL_ALLOC_CALLBACKS*", "pAllocCb"),
- Param("XGL_UINT", "maxGpus"),
- Param("XGL_UINT*", "pGpuCount"),
+ Param("uint32_t", "maxGpus"),
+ Param("uint32_t*", "pGpuCount"),
Param("XGL_PHYSICAL_GPU*", "pGpus")]),
Proto("XGL_RESULT", "GetGpuInfo",
[Param("XGL_PHYSICAL_GPU", "gpu"),
Param("XGL_PHYSICAL_GPU_INFO_TYPE", "infoType"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
- Proto("XGL_VOID*", "GetProcAddr",
+ Proto("void*", "GetProcAddr",
[Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("const XGL_CHAR*", "pName")]),
+ Param("const char*", "pName")]),
Proto("XGL_RESULT", "CreateDevice",
[Param("XGL_PHYSICAL_GPU", "gpu"),
@@ -243,33 +243,33 @@
Proto("XGL_RESULT", "GetExtensionSupport",
[Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("const XGL_CHAR*", "pExtName")]),
+ Param("const char*", "pExtName")]),
Proto("XGL_RESULT", "EnumerateLayers",
[Param("XGL_PHYSICAL_GPU", "gpu"),
- Param("XGL_SIZE", "maxLayerCount"),
- Param("XGL_SIZE", "maxStringSize"),
- Param("XGL_SIZE*", "pOutLayerCount"),
- Param("XGL_CHAR* const*", "pOutLayers"),
- Param("XGL_VOID*", "pReserved")]),
+ Param("size_t", "maxLayerCount"),
+ Param("size_t", "maxStringSize"),
+ Param("size_t*", "pOutLayerCount"),
+ Param("char* const*", "pOutLayers"),
+ Param("void*", "pReserved")]),
Proto("XGL_RESULT", "GetDeviceQueue",
[Param("XGL_DEVICE", "device"),
Param("XGL_QUEUE_TYPE", "queueType"),
- Param("XGL_UINT", "queueIndex"),
+ Param("uint32_t", "queueIndex"),
Param("XGL_QUEUE*", "pQueue")]),
Proto("XGL_RESULT", "QueueSubmit",
[Param("XGL_QUEUE", "queue"),
- Param("XGL_UINT", "cmdBufferCount"),
+ Param("uint32_t", "cmdBufferCount"),
Param("const XGL_CMD_BUFFER*", "pCmdBuffers"),
- Param("XGL_UINT", "memRefCount"),
+ Param("uint32_t", "memRefCount"),
Param("const XGL_MEMORY_REF*", "pMemRefs"),
Param("XGL_FENCE", "fence")]),
Proto("XGL_RESULT", "QueueSetGlobalMemReferences",
[Param("XGL_QUEUE", "queue"),
- Param("XGL_UINT", "memRefCount"),
+ Param("uint32_t", "memRefCount"),
Param("const XGL_MEMORY_REF*", "pMemRefs")]),
Proto("XGL_RESULT", "QueueWaitIdle",
@@ -293,15 +293,15 @@
Proto("XGL_RESULT", "MapMemory",
[Param("XGL_GPU_MEMORY", "mem"),
Param("XGL_FLAGS", "flags"),
- Param("XGL_VOID**", "ppData")]),
+ Param("void**", "ppData")]),
Proto("XGL_RESULT", "UnmapMemory",
[Param("XGL_GPU_MEMORY", "mem")]),
Proto("XGL_RESULT", "PinSystemMemory",
[Param("XGL_DEVICE", "device"),
- Param("const XGL_VOID*", "pSysMem"),
- Param("XGL_SIZE", "memSize"),
+ Param("const void*", "pSysMem"),
+ Param("size_t", "memSize"),
Param("XGL_GPU_MEMORY*", "pMem")]),
Proto("XGL_RESULT", "GetMultiGpuCompatibility",
@@ -336,18 +336,18 @@
Proto("XGL_RESULT", "GetObjectInfo",
[Param("XGL_BASE_OBJECT", "object"),
Param("XGL_OBJECT_INFO_TYPE", "infoType"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
Proto("XGL_RESULT", "BindObjectMemory",
[Param("XGL_OBJECT", "object"),
- Param("XGL_UINT", "allocationIdx"),
+ Param("uint32_t", "allocationIdx"),
Param("XGL_GPU_MEMORY", "mem"),
Param("XGL_GPU_SIZE", "memOffset")]),
Proto("XGL_RESULT", "BindObjectMemoryRange",
[Param("XGL_OBJECT", "object"),
- Param("XGL_UINT", "allocationIdx"),
+ Param("uint32_t", "allocationIdx"),
Param("XGL_GPU_SIZE", "rangeOffset"),
Param("XGL_GPU_SIZE", "rangeSize"),
Param("XGL_GPU_MEMORY", "mem"),
@@ -355,7 +355,7 @@
Proto("XGL_RESULT", "BindImageMemoryRange",
[Param("XGL_IMAGE", "image"),
- Param("XGL_UINT", "allocationIdx"),
+ Param("uint32_t", "allocationIdx"),
Param("const XGL_IMAGE_MEMORY_BIND_INFO*", "bindInfo"),
Param("XGL_GPU_MEMORY", "mem"),
Param("XGL_GPU_SIZE", "memOffset")]),
@@ -370,10 +370,10 @@
Proto("XGL_RESULT", "WaitForFences",
[Param("XGL_DEVICE", "device"),
- Param("XGL_UINT", "fenceCount"),
+ Param("uint32_t", "fenceCount"),
Param("const XGL_FENCE*", "pFences"),
- Param("XGL_BOOL", "waitAll"),
- Param("XGL_UINT64", "timeout")]),
+ Param("bool32_t", "waitAll"),
+ Param("uint64_t", "timeout")]),
Proto("XGL_RESULT", "CreateQueueSemaphore",
[Param("XGL_DEVICE", "device"),
@@ -409,17 +409,17 @@
Proto("XGL_RESULT", "GetQueryPoolResults",
[Param("XGL_QUERY_POOL", "queryPool"),
- Param("XGL_UINT", "startQuery"),
- Param("XGL_UINT", "queryCount"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("uint32_t", "startQuery"),
+ Param("uint32_t", "queryCount"),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
Proto("XGL_RESULT", "GetFormatInfo",
[Param("XGL_DEVICE", "device"),
Param("XGL_FORMAT", "format"),
Param("XGL_FORMAT_INFO_TYPE", "infoType"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
Proto("XGL_RESULT", "CreateBuffer",
[Param("XGL_DEVICE", "device"),
@@ -438,18 +438,18 @@
Proto("XGL_RESULT", "SetFastClearColor",
[Param("XGL_IMAGE", "pImage"),
- Param("const XGL_FLOAT[4]", "color")]),
+ Param("const float[4]", "color")]),
Proto("XGL_RESULT", "SetFastClearDepth",
[Param("XGL_IMAGE", "pImage"),
- Param("XGL_FLOAT", "depth")]),
+ Param("float", "depth")]),
Proto("XGL_RESULT", "GetImageSubresourceInfo",
[Param("XGL_IMAGE", "image"),
Param("const XGL_IMAGE_SUBRESOURCE*", "pSubresource"),
Param("XGL_SUBRESOURCE_INFO_TYPE", "infoType"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
Proto("XGL_RESULT", "CreateImageView",
[Param("XGL_DEVICE", "device"),
@@ -483,13 +483,13 @@
Proto("XGL_RESULT", "StorePipeline",
[Param("XGL_PIPELINE", "pipeline"),
- Param("XGL_SIZE*", "pDataSize"),
- Param("XGL_VOID*", "pData")]),
+ Param("size_t*", "pDataSize"),
+ Param("void*", "pData")]),
Proto("XGL_RESULT", "LoadPipeline",
[Param("XGL_DEVICE", "device"),
- Param("XGL_SIZE", "dataSize"),
- Param("const XGL_VOID*", "pData"),
+ Param("size_t", "dataSize"),
+ Param("const void*", "pData"),
Param("XGL_PIPELINE*", "pPipeline")]),
Proto("XGL_RESULT", "CreatePipelineDelta",
@@ -506,7 +506,7 @@
Proto("XGL_RESULT", "CreateDescriptorSetLayout",
[Param("XGL_DEVICE", "device"),
Param("XGL_FLAGS", "stageFlags"),
- Param("const XGL_UINT*", "pSetBindPoints"),
+ Param("const uint32_t*", "pSetBindPoints"),
Param("XGL_DESCRIPTOR_SET_LAYOUT", "priorSetLayout"),
Param("const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*", "pSetLayoutInfoList"),
Param("XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayout")]),
@@ -522,7 +522,7 @@
Proto("XGL_RESULT", "CreateDescriptorRegion",
[Param("XGL_DEVICE", "device"),
Param("XGL_DESCRIPTOR_REGION_USAGE", "regionUsage"),
- Param("XGL_UINT", "maxSets"),
+ Param("uint32_t", "maxSets"),
Param("const XGL_DESCRIPTOR_REGION_CREATE_INFO*", "pCreateInfo"),
Param("XGL_DESCRIPTOR_REGION*", "pDescriptorRegion")]),
@@ -532,19 +532,19 @@
Proto("XGL_RESULT", "AllocDescriptorSets",
[Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
Param("XGL_DESCRIPTOR_SET_USAGE", "setUsage"),
- Param("XGL_UINT", "count"),
+ Param("uint32_t", "count"),
Param("const XGL_DESCRIPTOR_SET_LAYOUT*", "pSetLayouts"),
Param("XGL_DESCRIPTOR_SET*", "pDescriptorSets"),
- Param("XGL_UINT*", "pCount")]),
+ Param("uint32_t*", "pCount")]),
- Proto("XGL_VOID", "ClearDescriptorSets",
+ Proto("void", "ClearDescriptorSets",
[Param("XGL_DESCRIPTOR_REGION", "descriptorRegion"),
- Param("XGL_UINT", "count"),
+ Param("uint32_t", "count"),
Param("const XGL_DESCRIPTOR_SET*", "pDescriptorSets")]),
- Proto("XGL_VOID", "UpdateDescriptors",
+ Proto("void", "UpdateDescriptors",
[Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
- Param("const XGL_VOID*", "pUpdateChain")]),
+ Param("const void*", "pUpdateChain")]),
Proto("XGL_RESULT", "CreateDynamicViewportState",
[Param("XGL_DEVICE", "device"),
@@ -581,217 +581,217 @@
Proto("XGL_RESULT", "ResetCommandBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer")]),
- Proto("XGL_VOID", "CmdBindPipeline",
+ Proto("void", "CmdBindPipeline",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("XGL_PIPELINE", "pipeline")]),
- Proto("XGL_VOID", "CmdBindPipelineDelta",
+ Proto("void", "CmdBindPipelineDelta",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("XGL_PIPELINE_DELTA", "delta")]),
- Proto("XGL_VOID", "CmdBindDynamicStateObject",
+ Proto("void", "CmdBindDynamicStateObject",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_STATE_BIND_POINT", "stateBindPoint"),
Param("XGL_DYNAMIC_STATE_OBJECT", "state")]),
- Proto("XGL_VOID", "CmdBindDescriptorSet",
+ Proto("void", "CmdBindDescriptorSet",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
Param("XGL_DESCRIPTOR_SET", "descriptorSet"),
- Param("const XGL_UINT*", "pUserData")]),
+ Param("const uint32_t*", "pUserData")]),
- Proto("XGL_VOID", "CmdBindVertexBuffer",
+ Proto("void", "CmdBindVertexBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
- Param("XGL_UINT", "binding")]),
+ Param("uint32_t", "binding")]),
- Proto("XGL_VOID", "CmdBindIndexBuffer",
+ Proto("void", "CmdBindIndexBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
Param("XGL_INDEX_TYPE", "indexType")]),
- Proto("XGL_VOID", "CmdDraw",
+ Proto("void", "CmdDraw",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_UINT", "firstVertex"),
- Param("XGL_UINT", "vertexCount"),
- Param("XGL_UINT", "firstInstance"),
- Param("XGL_UINT", "instanceCount")]),
+ Param("uint32_t", "firstVertex"),
+ Param("uint32_t", "vertexCount"),
+ Param("uint32_t", "firstInstance"),
+ Param("uint32_t", "instanceCount")]),
- Proto("XGL_VOID", "CmdDrawIndexed",
+ Proto("void", "CmdDrawIndexed",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_UINT", "firstIndex"),
- Param("XGL_UINT", "indexCount"),
- Param("XGL_INT", "vertexOffset"),
- Param("XGL_UINT", "firstInstance"),
- Param("XGL_UINT", "instanceCount")]),
+ Param("uint32_t", "firstIndex"),
+ Param("uint32_t", "indexCount"),
+ Param("int32_t", "vertexOffset"),
+ Param("uint32_t", "firstInstance"),
+ Param("uint32_t", "instanceCount")]),
- Proto("XGL_VOID", "CmdDrawIndirect",
+ Proto("void", "CmdDrawIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
- Param("XGL_UINT32", "count"),
- Param("XGL_UINT32", "stride")]),
+ Param("uint32_t", "count"),
+ Param("uint32_t", "stride")]),
- Proto("XGL_VOID", "CmdDrawIndexedIndirect",
+ Proto("void", "CmdDrawIndexedIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset"),
- Param("XGL_UINT32", "count"),
- Param("XGL_UINT32", "stride")]),
+ Param("uint32_t", "count"),
+ Param("uint32_t", "stride")]),
- Proto("XGL_VOID", "CmdDispatch",
+ Proto("void", "CmdDispatch",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("XGL_UINT", "x"),
- Param("XGL_UINT", "y"),
- Param("XGL_UINT", "z")]),
+ Param("uint32_t", "x"),
+ Param("uint32_t", "y"),
+ Param("uint32_t", "z")]),
- Proto("XGL_VOID", "CmdDispatchIndirect",
+ Proto("void", "CmdDispatchIndirect",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "buffer"),
Param("XGL_GPU_SIZE", "offset")]),
- Proto("XGL_VOID", "CmdCopyBuffer",
+ Proto("void", "CmdCopyBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "srcBuffer"),
Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_UINT", "regionCount"),
+ Param("uint32_t", "regionCount"),
Param("const XGL_BUFFER_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCopyImage",
+ Proto("void", "CmdCopyImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "srcImage"),
Param("XGL_IMAGE", "destImage"),
- Param("XGL_UINT", "regionCount"),
+ Param("uint32_t", "regionCount"),
Param("const XGL_IMAGE_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCopyBufferToImage",
+ Proto("void", "CmdCopyBufferToImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "srcBuffer"),
Param("XGL_IMAGE", "destImage"),
- Param("XGL_UINT", "regionCount"),
+ Param("uint32_t", "regionCount"),
Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCopyImageToBuffer",
+ Proto("void", "CmdCopyImageToBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "srcImage"),
Param("XGL_BUFFER", "destBuffer"),
- Param("XGL_UINT", "regionCount"),
+ Param("uint32_t", "regionCount"),
Param("const XGL_BUFFER_IMAGE_COPY*", "pRegions")]),
- Proto("XGL_VOID", "CmdCloneImageData",
+ Proto("void", "CmdCloneImageData",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "srcImage"),
Param("XGL_IMAGE_LAYOUT", "srcImageLayout"),
Param("XGL_IMAGE", "destImage"),
Param("XGL_IMAGE_LAYOUT", "destImageLayout")]),
- Proto("XGL_VOID", "CmdUpdateBuffer",
+ Proto("void", "CmdUpdateBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset"),
Param("XGL_GPU_SIZE", "dataSize"),
- Param("const XGL_UINT32*", "pData")]),
+ Param("const uint32_t*", "pData")]),
- Proto("XGL_VOID", "CmdFillBuffer",
+ Proto("void", "CmdFillBuffer",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset"),
Param("XGL_GPU_SIZE", "fillSize"),
- Param("XGL_UINT32", "data")]),
+ Param("uint32_t", "data")]),
- Proto("XGL_VOID", "CmdClearColorImage",
+ Proto("void", "CmdClearColorImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "image"),
- Param("const XGL_FLOAT[4]", "color"),
- Param("XGL_UINT", "rangeCount"),
+ Param("const float[4]", "color"),
+ Param("uint32_t", "rangeCount"),
Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
- Proto("XGL_VOID", "CmdClearColorImageRaw",
+ Proto("void", "CmdClearColorImageRaw",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "image"),
- Param("const XGL_UINT32[4]", "color"),
- Param("XGL_UINT", "rangeCount"),
+ Param("const uint32_t[4]", "color"),
+ Param("uint32_t", "rangeCount"),
Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
- Proto("XGL_VOID", "CmdClearDepthStencil",
+ Proto("void", "CmdClearDepthStencil",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "image"),
- Param("XGL_FLOAT", "depth"),
- Param("XGL_UINT32", "stencil"),
- Param("XGL_UINT", "rangeCount"),
+ Param("float", "depth"),
+ Param("uint32_t", "stencil"),
+ Param("uint32_t", "rangeCount"),
Param("const XGL_IMAGE_SUBRESOURCE_RANGE*", "pRanges")]),
- Proto("XGL_VOID", "CmdResolveImage",
+ Proto("void", "CmdResolveImage",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_IMAGE", "srcImage"),
Param("XGL_IMAGE", "destImage"),
- Param("XGL_UINT", "rectCount"),
+ Param("uint32_t", "rectCount"),
Param("const XGL_IMAGE_RESOLVE*", "pRects")]),
- Proto("XGL_VOID", "CmdSetEvent",
+ Proto("void", "CmdSetEvent",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_EVENT", "event"),
Param("XGL_SET_EVENT", "pipeEvent")]),
- Proto("XGL_VOID", "CmdResetEvent",
+ Proto("void", "CmdResetEvent",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_EVENT", "event")]),
- Proto("XGL_VOID", "CmdWaitEvents",
+ Proto("void", "CmdWaitEvents",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("const XGL_EVENT_WAIT_INFO*", "pWaitInfo")]),
- Proto("XGL_VOID", "CmdPipelineBarrier",
+ Proto("void", "CmdPipelineBarrier",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("const XGL_PIPELINE_BARRIER*", "pBarrier")]),
- Proto("XGL_VOID", "CmdBeginQuery",
+ Proto("void", "CmdBeginQuery",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_QUERY_POOL", "queryPool"),
- Param("XGL_UINT", "slot"),
+ Param("uint32_t", "slot"),
Param("XGL_FLAGS", "flags")]),
- Proto("XGL_VOID", "CmdEndQuery",
+ Proto("void", "CmdEndQuery",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_QUERY_POOL", "queryPool"),
- Param("XGL_UINT", "slot")]),
+ Param("uint32_t", "slot")]),
- Proto("XGL_VOID", "CmdResetQueryPool",
+ Proto("void", "CmdResetQueryPool",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_QUERY_POOL", "queryPool"),
- Param("XGL_UINT", "startQuery"),
- Param("XGL_UINT", "queryCount")]),
+ Param("uint32_t", "startQuery"),
+ Param("uint32_t", "queryCount")]),
- Proto("XGL_VOID", "CmdWriteTimestamp",
+ Proto("void", "CmdWriteTimestamp",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_TIMESTAMP_TYPE", "timestampType"),
Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset")]),
- Proto("XGL_VOID", "CmdInitAtomicCounters",
+ Proto("void", "CmdInitAtomicCounters",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("XGL_UINT", "startCounter"),
- Param("XGL_UINT", "counterCount"),
- Param("const XGL_UINT32*", "pData")]),
+ Param("uint32_t", "startCounter"),
+ Param("uint32_t", "counterCount"),
+ Param("const uint32_t*", "pData")]),
- Proto("XGL_VOID", "CmdLoadAtomicCounters",
+ Proto("void", "CmdLoadAtomicCounters",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("XGL_UINT", "startCounter"),
- Param("XGL_UINT", "counterCount"),
+ Param("uint32_t", "startCounter"),
+ Param("uint32_t", "counterCount"),
Param("XGL_BUFFER", "srcBuffer"),
Param("XGL_GPU_SIZE", "srcOffset")]),
- Proto("XGL_VOID", "CmdSaveAtomicCounters",
+ Proto("void", "CmdSaveAtomicCounters",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
Param("XGL_PIPELINE_BIND_POINT", "pipelineBindPoint"),
- Param("XGL_UINT", "startCounter"),
- Param("XGL_UINT", "counterCount"),
+ Param("uint32_t", "startCounter"),
+ Param("uint32_t", "counterCount"),
Param("XGL_BUFFER", "destBuffer"),
Param("XGL_GPU_SIZE", "destOffset")]),
@@ -811,37 +811,37 @@
Proto("XGL_RESULT", "DbgRegisterMsgCallback",
[Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback"),
- Param("XGL_VOID*", "pUserData")]),
+ Param("void*", "pUserData")]),
Proto("XGL_RESULT", "DbgUnregisterMsgCallback",
[Param("XGL_DBG_MSG_CALLBACK_FUNCTION", "pfnMsgCallback")]),
Proto("XGL_RESULT", "DbgSetMessageFilter",
[Param("XGL_DEVICE", "device"),
- Param("XGL_INT", "msgCode"),
+ Param("int32_t", "msgCode"),
Param("XGL_DBG_MSG_FILTER", "filter")]),
Proto("XGL_RESULT", "DbgSetObjectTag",
[Param("XGL_BASE_OBJECT", "object"),
- Param("XGL_SIZE", "tagSize"),
- Param("const XGL_VOID*", "pTag")]),
+ Param("size_t", "tagSize"),
+ Param("const void*", "pTag")]),
Proto("XGL_RESULT", "DbgSetGlobalOption",
[Param("XGL_DBG_GLOBAL_OPTION", "dbgOption"),
- Param("XGL_SIZE", "dataSize"),
- Param("const XGL_VOID*", "pData")]),
+ Param("size_t", "dataSize"),
+ Param("const void*", "pData")]),
Proto("XGL_RESULT", "DbgSetDeviceOption",
[Param("XGL_DEVICE", "device"),
Param("XGL_DBG_DEVICE_OPTION", "dbgOption"),
- Param("XGL_SIZE", "dataSize"),
- Param("const XGL_VOID*", "pData")]),
+ Param("size_t", "dataSize"),
+ Param("const void*", "pData")]),
- Proto("XGL_VOID", "CmdDbgMarkerBegin",
+ Proto("void", "CmdDbgMarkerBegin",
[Param("XGL_CMD_BUFFER", "cmdBuffer"),
- Param("const XGL_CHAR*", "pMarker")]),
+ Param("const char*", "pMarker")]),
- Proto("XGL_VOID", "CmdDbgMarkerEnd",
+ Proto("void", "CmdDbgMarkerEnd",
[Param("XGL_CMD_BUFFER", "cmdBuffer")]),
],
)
@@ -859,7 +859,7 @@
[Param("XGL_DEVICE", "device"),
Param("xcb_window_t", "window"),
Param("xcb_randr_crtc_t", "crtc"),
- Param("XGL_UINT64*", "pMsc")]),
+ Param("uint64_t*", "pMsc")]),
Proto("XGL_RESULT", "WsiX11CreatePresentableImage",
[Param("XGL_DEVICE", "device"),
diff --git a/xgl_helper.py b/xgl_helper.py
index 23a6723..5a85faa 100755
--- a/xgl_helper.py
+++ b/xgl_helper.py
@@ -425,7 +425,7 @@
def _generateDynamicPrintFunctions(self):
dp_funcs = []
- dp_funcs.append("\nvoid dynamic_display_full_txt(const XGL_VOID* pStruct, uint32_t indent)\n{\n // Cast to APP_INFO ptr initially just to pull sType off struct")
+ dp_funcs.append("\nvoid dynamic_display_full_txt(const void* pStruct, uint32_t indent)\n{\n // Cast to APP_INFO ptr initially just to pull sType off struct")
dp_funcs.append(" XGL_STRUCTURE_TYPE sType = ((XGL_APPLICATION_INFO*)pStruct)->sType;\n")
dp_funcs.append(" switch (sType)\n {")
for e in enum_type_dict:
@@ -549,7 +549,7 @@
if (stp_list[index]['ptr']):
sh_funcs.append(' if (pStruct->%s) {\n' % stp_list[index]['name'])
if 'pNext' == stp_list[index]['name']:
- sh_funcs.append(' tmpStr = dynamic_display((XGL_VOID*)pStruct->pNext, prefix);\n')
+ sh_funcs.append(' tmpStr = dynamic_display((void*)pStruct->pNext, prefix);\n')
sh_funcs.append(' len = 256+strlen(tmpStr);\n')
sh_funcs.append(' stp_strs[%i] = (char*)malloc(len);\n' % index)
if self.no_addr:
@@ -604,7 +604,7 @@
sh_funcs.append(' }\n')
sh_funcs.append(" return str;\n}\n")
# Add function to dynamically print out unknown struct
- sh_funcs.append("char* dynamic_display(const XGL_VOID* pStruct, const char* prefix)\n{\n")
+ sh_funcs.append("char* dynamic_display(const void* pStruct, const char* prefix)\n{\n")
sh_funcs.append(" // Cast to APP_INFO ptr initially just to pull sType off struct\n")
sh_funcs.append(" XGL_STRUCTURE_TYPE sType = ((XGL_APPLICATION_INFO*)pStruct)->sType;\n")
sh_funcs.append(' char indent[100];\n strcpy(indent, " ");\n strcat(indent, prefix);\n')
@@ -669,7 +669,7 @@
if (stp_list[index]['ptr']):
sh_funcs.append(' if (pStruct->%s) {' % stp_list[index]['name'])
if 'pNext' == stp_list[index]['name']:
- sh_funcs.append(' tmp_str = dynamic_display((XGL_VOID*)pStruct->pNext, prefix);')
+ sh_funcs.append(' tmp_str = dynamic_display((void*)pStruct->pNext, prefix);')
else:
sh_funcs.append(' tmp_str = %s(pStruct->%s, extra_indent);' % (self._get_sh_func_name(stp_list[index]['type']), stp_list[index]['name']))
sh_funcs.append(' ss[%u] << %spStruct->%s;' % (index, addr_char, stp_list[index]['name']))
@@ -736,7 +736,7 @@
sh_funcs.append(' final_str = %s;' % final_str)
sh_funcs.append(' return final_str;\n}')
# Add function to dynamically print out unknown struct
- sh_funcs.append("string dynamic_display(const XGL_VOID* pStruct, const string prefix)\n{")
+ sh_funcs.append("string dynamic_display(const void* pStruct, const string prefix)\n{")
sh_funcs.append(" // Cast to APP_INFO ptr initially just to pull sType off struct")
sh_funcs.append(" XGL_STRUCTURE_TYPE sType = ((XGL_APPLICATION_INFO*)pStruct)->sType;")
sh_funcs.append(' string indent = " ";')
@@ -793,7 +793,7 @@
i_declared = False
for member in sorted(self.struct_dict[s]):
# TODO : Need to display each member based on its type
- # TODO : Need to handle pNext which are structs, but of XGL_VOID* type
+ # TODO : Need to handle pNext which are structs, but of void* type
# Can grab struct type off of header of struct pointed to
# TODO : Handle Arrays
if self.struct_dict[s][member]['array']:
@@ -865,7 +865,7 @@
if 'xgl_enum_string_helper' not in f:
header.append("#include <%s>\n" % f)
header.append('#include "xgl_enum_string_helper.h"\n\n// Function Prototypes\n')
- header.append("char* dynamic_display(const XGL_VOID* pStruct, const char* prefix);\n")
+ header.append("char* dynamic_display(const void* pStruct, const char* prefix);\n")
return "".join(header)
def _generateStringHelperHeaderCpp(self):
@@ -876,7 +876,7 @@
header.append("#include <%s>\n" % f)
header.append('#include "xgl_enum_string_helper.h"\n')
header.append('using namespace std;\n\n// Function Prototypes\n')
- header.append("string dynamic_display(const XGL_VOID* pStruct, const string prefix);\n")
+ header.append("string dynamic_display(const void* pStruct, const string prefix);\n")
return "".join(header)
def _generateValidateHelperFunctions(self):
@@ -907,7 +907,7 @@
if 'xgl_enum_validate_helper' not in f:
header.append("#include <%s>\n" % f)
header.append('#include "xgl_enum_validate_helper.h"\n\n// Function Prototypes\n')
- #header.append("char* dynamic_display(const XGL_VOID* pStruct, const char* prefix);\n")
+ #header.append("char* dynamic_display(const void* pStruct, const char* prefix);\n")
return "".join(header)
def _generateHeader(self):
@@ -1066,7 +1066,7 @@
if 'xgl_enum_string_helper' not in f:
header.append("#include <%s>\n" % f)
#header.append('#include "xgl_enum_string_helper.h"\n\n// Function Prototypes\n')
- header.append("\nchar* dynamic_gv_display(const XGL_VOID* pStruct, const char* prefix);\n")
+ header.append("\nchar* dynamic_gv_display(const void* pStruct, const char* prefix);\n")
return "".join(header)
def _get_gv_func_name(self, struct):
@@ -1135,7 +1135,7 @@
for s in self.struct_dict:
gv_funcs.append('char* %s(const %s* pStruct, const char* myNodeName);\n' % (self._get_gv_func_name(s), typedef_fwd_dict[s]))
if s.lower().strip("_") in array_func_list:
- gv_funcs.append('char* %s_array(XGL_UINT count, const %s* pStruct, const char* myNodeName);\n' % (self._get_gv_func_name(s), typedef_fwd_dict[s]))
+ gv_funcs.append('char* %s_array(uint32_t count, const %s* pStruct, const char* myNodeName);\n' % (self._get_gv_func_name(s), typedef_fwd_dict[s]))
gv_funcs.append('\n')
for s in self.struct_dict:
p_out = ""
@@ -1168,7 +1168,7 @@
gv_funcs.append(' if (pStruct->%s) {\n' % stp_list[index]['name'])
if 'pNext' == stp_list[index]['name']:
gv_funcs.append(' sprintf(nodeName, "pNext_%p", (void*)pStruct->pNext);\n')
- gv_funcs.append(' tmpStr = dynamic_gv_display((XGL_VOID*)pStruct->pNext, nodeName);\n')
+ gv_funcs.append(' tmpStr = dynamic_gv_display((void*)pStruct->pNext, nodeName);\n')
gv_funcs.append(' stp_strs[%i] = (char*)malloc(256+strlen(tmpStr)+strlen(nodeName)+strlen(myNodeName));\n' % index)
gv_funcs.append(' sprintf(stp_strs[%i], "%%s\\n\\"%%s\\":pNext -> \\"%%s\\" [];\\n", tmpStr, myNodeName, nodeName);\n' % index)
gv_funcs.append(' free(tmpStr);\n')
@@ -1216,7 +1216,7 @@
gv_funcs.append(' }\n')
gv_funcs.append(" return str;\n}\n")
if s.lower().strip("_") in array_func_list:
- gv_funcs.append('char* %s_array(XGL_UINT count, const %s* pStruct, const char* myNodeName)\n{\n char* str;\n char tmpStr[1024];\n' % (self._get_gv_func_name(s), typedef_fwd_dict[s]))
+ gv_funcs.append('char* %s_array(uint32_t count, const %s* pStruct, const char* myNodeName)\n{\n char* str;\n char tmpStr[1024];\n' % (self._get_gv_func_name(s), typedef_fwd_dict[s]))
gv_funcs.append(' str = (char*)malloc(sizeof(char)*1024*count);\n')
gv_funcs.append(' sprintf(str, "\\"%s\\" [\\nlabel = <<TABLE BORDER=\\"0\\" CELLBORDER=\\"1\\" CELLSPACING=\\"0\\"><TR><TD COLSPAN=\\"3\\">%s (%p)</TD></TR>", myNodeName, myNodeName, pStruct);\n')
gv_funcs.append(' for (uint32_t i=0; i < count; i++) {\n')
@@ -1250,7 +1250,7 @@
gv_funcs.append(' }\n')
gv_funcs.append(' return str;\n}\n')
# Add function to dynamically print out unknown struct
- gv_funcs.append("char* dynamic_gv_display(const XGL_VOID* pStruct, const char* nodeName)\n{\n")
+ gv_funcs.append("char* dynamic_gv_display(const void* pStruct, const char* nodeName)\n{\n")
gv_funcs.append(" // Cast to APP_INFO ptr initially just to pull sType off struct\n")
gv_funcs.append(" XGL_STRUCTURE_TYPE sType = ((XGL_APPLICATION_INFO*)pStruct)->sType;\n")
gv_funcs.append(" switch (sType)\n {\n")