Skip to content

Commit

Permalink
renaming: Move many xgl files to vk version
Browse files Browse the repository at this point in the history
  • Loading branch information
courtney-lunarg authored and Chia-I Wu committed Apr 16, 2015
1 parent b97b8af commit 6082a4d
Show file tree
Hide file tree
Showing 33 changed files with 2,252 additions and 9,159 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CMakeFiles/
cmake_install.cmake
Makefile
__pycache__
XGLConfig.h
VKConfig.h
*.so
*.so.*
icd/common/libicd.a
Expand Down
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# The name of our project is "XGL". CMakeLists files in this project can
# refer to the root source directory of the project as ${XGL_SOURCE_DIR} and
# to the root binary directory of the project as ${XGL_BINARY_DIR}.
# The name of our project is "VULKAN". CMakeLists files in this project can
# refer to the root source directory of the project as ${VULKAN_SOURCE_DIR} and
# to the root binary directory of the project as ${VULKAN_BINARY_DIR}.
cmake_minimum_required(VERSION 2.8.11)
project (XGL)
project (VULKAN)
# set (CMAKE_VERBOSE_MAKEFILE 1)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
Expand Down Expand Up @@ -42,9 +42,9 @@ else()
set(PYTHON_CMD "py")
endif()

# loader: Generic XGL ICD loader
# icd: Device dependent (DD) XGL components
# tests: XGL tests
# loader: Generic VULKAN ICD loader
# icd: Device dependent (DD) VULKAN components
# tests: VULKAN tests
add_subdirectory(loader)
add_subdirectory(icd)
if (NOT WIN32)
Expand Down
10 changes: 5 additions & 5 deletions demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES")

if(WIN32)
set (LIBRARIES "XGL")
set (LIBRARIES "vulkan")
endif()
if(NOT WIN32)
set (LIBRARIES "XGL")
set (LIBRARIES "vulkan")
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
COMMAND mv vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
Expand All @@ -43,7 +43,7 @@ if(NOT WIN32)
"${PROJECT_SOURCE_DIR}/icd/common"
)

link_libraries(${XCB_LIBRARIES} XGL png m)
link_libraries(${XCB_LIBRARIES} vulkan png m)
endif()
if(WIN32)
include_directories (
Expand All @@ -59,8 +59,8 @@ else()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEXTERNAL_SPV")
endif()

add_executable(xglinfo xglinfo.c)
target_link_libraries(xglinfo ${LIBRARIES})
add_executable(vulkaninfo vulkaninfo.c)
target_link_libraries(vulkaninfo ${LIBRARIES})

add_executable(tri tri.c)
target_link_libraries(tri ${LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion demos/cube.c
Original file line number Diff line number Diff line change
Expand Up @@ -1543,7 +1543,7 @@ static void demo_prepare_descriptor_set(struct demo *demo)
view_info[i].view = demo->textures[i].view,
view_info[i].layout = VK_IMAGE_LAYOUT_GENERAL;

combined_info[i].sampler = demo->textures[i].sampler;
combined_info[i].pSampler = demo->textures[i].sampler;
combined_info[i].pImageView = &view_info[i];
}

Expand Down
2 changes: 1 addition & 1 deletion demos/tri.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ static void demo_prepare_descriptor_set(struct demo *demo)
view_info[i].view = demo->textures[i].view,
view_info[i].layout = VK_IMAGE_LAYOUT_GENERAL;

combined_info[i].sampler = demo->textures[i].sampler;
combined_info[i].pSampler = demo->textures[i].sampler;
combined_info[i].pImageView = &view_info[i];
}

Expand Down
File renamed without changes.
180 changes: 180 additions & 0 deletions docs/vk_ds.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
digraph g {
graph [
rankdir = "LR"
];
node [
fontsize = "16"
shape = "plaintext"
];
edge [
];
subgraph clusterDSCreate1
{
label="vkCreateDescriptorSet()"
"_VK_DESCRIPTOR_SET_CREATE_INFO1" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD>sType=<BR/>VK_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="vkCreateDescriptorSet()"
"_VK_DESCRIPTOR_SET_CREATE_INFO2" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_DESCRIPTOR_SET_CREATE_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD>sType=<BR/>VK_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="vkCreateSampler - multiple calls return unique VK_SAMPLER handles"
"_VK_SAMPLER_CREATE_INFO_0" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">VK_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">VK_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">VK_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">VK_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">VK_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">VK_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">VK_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
"SAMPLER_ELLIPSES" [
label = "..."
];
"_VK_SAMPLER_CREATE_INFO_19" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_SAMPLER_CREATE_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_TEX_FILTER</TD><TD PORT="f6">magFilter</TD></TR><TR><TD PORT="f7">VK_TEX_FILTER</TD><TD PORT="f8">minFilter</TD></TR><TR><TD PORT="f9">VK_TEX_MIPMAP_MODE</TD><TD PORT="f10">mipMode</TD></TR><TR><TD PORT="f11">VK_TEX_ADDRESS</TD><TD PORT="f12">addressU</TD></TR><TR><TD PORT="f13">VK_TEX_ADDRESS</TD><TD PORT="f14">addressV</TD></TR><TR><TD PORT="f15">VK_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">VK_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">VK_BORDER_COLOR_TYPE</TD><TD PORT="f28">borderColorType</TD></TR></TABLE>>
];
}
subgraph clusterSamplerAttach
{
label="vkAttachSamplerDescriptors&#92;npSamplers array of VK_SAMPLERS"
"SAMPLER_ARRAY" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD PORT="pSamp">pSamplers</TD></TR><TR><TD PORT="f0">VK_SAMPLER0</TD></TR><TR><TD PORT="f1">VK_SAMPLER1</TD></TR><TR><TD PORT="f2">VK_SAMPLER2</TD></TR><TR><TD PORT="f3">VK_SAMPLER3</TD></TR><TR><TD PORT="f4">VK_SAMPLER4</TD></TR><TR><TD PORT="f5">VK_SAMPLER5</TD></TR><TR><TD PORT="f6">VK_SAMPLER6</TD></TR><TR><TD PORT="f7">VK_SAMPLER7</TD></TR><TR><TD PORT="f8">VK_SAMPLER8</TD></TR><TR><TD PORT="f9">VK_SAMPLER9</TD></TR><TR><TD PORT="f10">VK_SAMPLER10</TD></TR><TR><TD PORT="f11">VK_SAMPLER11</TD></TR><TR><TD PORT="f12">VK_SAMPLER12</TD></TR><TR><TD PORT="f13">VK_SAMPLER13</TD></TR><TR><TD PORT="f14">VK_SAMPLER14</TD></TR><TR><TD PORT="f15">VK_SAMPLER15</TD></TR><TR><TD PORT="f16">VK_SAMPLER16</TD></TR><TR><TD PORT="f17">VK_SAMPLER17</TD></TR><TR><TD PORT="f18">VK_SAMPLER18</TD></TR><TR><TD PORT="f19">VK_SAMPLER19</TD></TR></TABLE>>
];
}
"DS1_MEMORY" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD PORT="ds1">DS1 Memory</TD></TR><TR><TD PORT="f0">slot0</TD></TR><TR><TD PORT="f1">slot1</TD></TR><TR><TD PORT="f2">slots2</TD></TR><TR><TD PORT="f3">slots3</TD></TR><TR><TD PORT="f4">slots4</TD></TR><TR><TD PORT="f5">slots5</TD></TR><TR><TD PORT="f6">slots6</TD></TR><TR><TD PORT="f7">slots7</TD></TR><TR><TD PORT="f8">slots8</TD></TR><TR><TD PORT="f9">slots9</TD></TR><TR><TD PORT="f10">slots10</TD></TR><TR><TD PORT="f11">slots11</TD></TR><TR><TD PORT="f12">slots12</TD></TR><TR><TD PORT="f13">slot13</TD></TR></TABLE>>
];
"DS2_MEMORY" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD PORT="ds2">DS2 Memory</TD></TR><TR><TD PORT="f0">slot0</TD></TR><TR><TD PORT="f1">slot1</TD></TR><TR><TD PORT="f2">slots2</TD></TR><TR><TD PORT="f3">slots3</TD></TR><TR><TD PORT="f4">slots4</TD></TR><TR><TD PORT="f5">slots5</TD></TR><TR><TD PORT="f6">slots6</TD></TR><TR><TD PORT="f7">slots7</TD></TR><TR><TD PORT="f8">slots8</TD></TR><TR><TD PORT="f9">slots9</TD></TR><TR><TD PORT="f10">slots10</TD></TR><TR><TD PORT="f11">slots11</TD></TR><TR><TD PORT="f12">slots12</TD></TR><TR><TD PORT="f13">slot13</TD></TR><TR><TD PORT="f14">slots14</TD></TR><TR><TD PORT="f15">slots15</TD></TR><TR><TD PORT="f16">slots16</TD></TR><TR><TD PORT="f17">slots17</TD></TR><TR><TD PORT="f18">slots18</TD></TR><TR><TD PORT="f19">slots19</TD></TR></TABLE>>
];
subgraph clusterMemoryView
{
label="vkAttachMemoryViewDescriptors - pMemViews array of VK_MEMORY_VIEW_ATTACH_INFO structs"
"_VK_MEMORY_VIEW_ATTACH_INFO_3" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">VK_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">VK_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">VK_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">VK_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">VK_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
"MEM_VIEW_ELLIPSES" [
label = "..."
];
"_VK_MEMORY_VIEW_ATTACH_INFO_0" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_MEMORY_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_GPU_MEMORY</TD><TD PORT="f6">mem</TD></TR><TR><TD PORT="f7">VK_GPU_SIZE</TD><TD PORT="f8">offset</TD></TR><TR><TD PORT="f9">VK_GPU_SIZE</TD><TD PORT="f10">range</TD></TR><TR><TD PORT="f11">VK_GPU_SIZE</TD><TD PORT="f12">stride</TD></TR><TR><TD PORT="f13">VK_FORMAT</TD><TD PORT="f14">format</TD></TR><TR><TD PORT="f15">VK_MEMORY_STATE</TD><TD PORT="f16">state</TD></TR></TABLE>>
];
}
subgraph clusterImageView
{
label="vkAttachImageViewDescriptors - pImageViews array of VK_IMAGE_VIEW_ATTACH_INFO structs"
"_VK_IMAGE_VIEW_ATTACH_INFO_9" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">VK_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
"IMG_VIEW_ELLIPSES" [
label = "..."
];
"_VK_IMAGE_VIEW_ATTACH_INFO_0" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_IMAGE_VIEW_ATTACH_INFO</TD></TR><TR><TD PORT="f1">VK_STRUCTURE_TYPE</TD><TD PORT="f2">sType=<BR/>VK_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">VK_IMAGE_VIEW</TD><TD PORT="f6">view</TD></TR><TR><TD PORT="f7">VK_IMAGE_STATE</TD><TD PORT="f8">state</TD></TR></TABLE>>
];
}
"VS_VK_DESCRIPTOR_SET_MAPPING" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=2</TD></TR><TR><TD PORT="f3">const VK_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"VS_VK_DESCRIPTOR_SLOT_INFO" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">VK_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">VK_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_VK_DESCRIPTOR_SET_MAPPING" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=6</TD></TR><TR><TD PORT="f3">const VK_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS0_VK_DESCRIPTOR_SLOT_INFO" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">VK_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">VK_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_VK_DESCRIPTOR_SET_MAPPING" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="2" PORT="f0">VK_DESCRIPTOR_SET_MAPPING</TD></TR><TR><TD PORT="f1">uint32_t</TD><TD PORT="f2">descriptorCount=10</TD></TR><TR><TD PORT="f3">const VK_DESCRIPTOR_SLOT_INFO*</TD><TD PORT="f4">pDescriptorInfo</TD></TR></TABLE>>
];
"FS1_VK_DESCRIPTOR_SLOT_INFO" [
label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0"> <TR><TD COLSPAN="3" PORT="f0">VK_DESCRIPTOR_SLOT_INFO</TD></TR><TR><TD PORT="f2">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f3">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f8">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f13">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f18">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f23">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f28">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f33">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f38">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f43">VK_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">VK_DESCRIPTOR_SET_SLOT_TYPE</TD><TD PORT="f48">VK_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>>
];
/*
"_VK_DESCRIPTOR_SET_CREATE_INFO1":f2 -> "_VK_DESCRIPTOR_SET_CREATE_INFO2":f0 [
id = 0
];
*/
"_VK_DESCRIPTOR_SET_CREATE_INFO1":f4 -> "DS1_MEMORY":ds1 [
id = 1
];
"_VK_DESCRIPTOR_SET_CREATE_INFO2":f4 -> "DS2_MEMORY":ds2 [
id = 2
];
/*
"_VK_SAMPLER_CREATE_INFO_0":f4 -> "_ELLIPSE0" [
id = 3
];
"_ELLIPSE0" -> "_VK_SAMPLER_CREATE_INFO_19":f0 [
id = 3
];
*/
"_VK_SAMPLER_CREATE_INFO_0" -> "SAMPLER_ARRAY":f0 [
id = 4
];
"_VK_SAMPLER_CREATE_INFO_19" -> "SAMPLER_ARRAY":f19 [
id = 5
];
"SAMPLER_ARRAY":f0 -> "DS2_MEMORY":f0 [
id = 6
];
"SAMPLER_ARRAY":f19 -> "DS2_MEMORY":f19 [
id = 7
];
/*
"_VK_MEMORY_VIEW_ATTACH_INFO_0":f4 -> "_ELLIPSE1" [
id = 6
];
"_ELLIPSE1" -> "_VK_MEMORY_VIEW_ATTACH_INFO_3":f0 [
id = 7
];
"_VK_IMAGE_VIEW_ATTACH_INFO_0":f4 -> "_ELLIPSE2" [
id = 8
];
"_ELLIPSE2" -> "_VK_IMAGE_VIEW_ATTACH_INFO_9":f0 [
id = 9
];
*/
"_VK_MEMORY_VIEW_ATTACH_INFO_0" -> "DS1_MEMORY":f0 [
id = 10
];
"_VK_MEMORY_VIEW_ATTACH_INFO_3" -> "DS1_MEMORY":f3 [
id = 11
];
"_VK_IMAGE_VIEW_ATTACH_INFO_0" -> "DS1_MEMORY":f4 [
id = 10
];
"_VK_IMAGE_VIEW_ATTACH_INFO_9" -> "DS1_MEMORY":f13 [
id = 11
];
"VS_VK_DESCRIPTOR_SET_MAPPING":f4 -> "VS_VK_DESCRIPTOR_SLOT_INFO":f0 [
id = 12
];
"VS_VK_DESCRIPTOR_SLOT_INFO":f1 -> "DS1_MEMORY":f0 [
id = 13
];
"VS_VK_DESCRIPTOR_SLOT_INFO":f6 -> "DS1_MEMORY":f1 [
id = 14
];
"FS0_VK_DESCRIPTOR_SET_MAPPING":f4 -> "FS0_VK_DESCRIPTOR_SLOT_INFO":f0 [
id = 15
];
"FS0_VK_DESCRIPTOR_SLOT_INFO":f1 -> "DS1_MEMORY":f0 [
id = 16
];
"FS0_VK_DESCRIPTOR_SLOT_INFO":f26 -> "DS1_MEMORY":f5 [
id = 17
];
"FS1_VK_DESCRIPTOR_SET_MAPPING":f4 -> "FS1_VK_DESCRIPTOR_SLOT_INFO":f0 [
id = 15
];
"FS1_VK_DESCRIPTOR_SLOT_INFO":f1 -> "DS2_MEMORY":f0 [
id = 16
];
"FS1_VK_DESCRIPTOR_SLOT_INFO":f46 -> "DS2_MEMORY":f9 [
id = 17
];
}

File renamed without changes
Loading

0 comments on commit 6082a4d

Please sign in to comment.