Skip to content

A
angle
Commit e8e12881 by Courtney Goeltzenleuchter Committed by Commit Bot
Options

Roll Vulkan headers, update ANGLE to match

All the *_RANGE_SIZE enums were removed from vulkan_core.h Fix up ANGLE references. Bug: b/155750030 Change-Id: Idc4ee20d4a87f8cb3f46e105819af7257a7fea4b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2182577 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarIan Elliott <ianelliott@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d657e1d7
Showing with 20 additions and 12 deletions
DEPS
...@@ -49,10 +49,10 @@ vars = { ...@@ -49,10 +49,10 @@ vars = {
'spirv_tools_revision': '2e1d208ed9deab9048a00e60bb891d5e12a8332e', 'spirv_tools_revision': '2e1d208ed9deab9048a00e60bb891d5e12a8332e',
# Current revision of Khronos Vulkan-Headers. # Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': '4c19ae6b95e44c821d5306adf94842defa57ba21', 'vulkan_headers_revision': '9250d5ae8f50202005233dc0512a1d460c8b4833',
# Current revision of Khronos Vulkan-Loader. # Current revision of Khronos Vulkan-Loader.
'vulkan_loader_revision': 'f39209eb4402ff7c2f6a844cdf3f62dbc0a6c90f', 'vulkan_loader_revision': '1bf08b392b8e34204b7df0f0d6365f61dfe53826',
# Current revision of Khronos Vulkan-Tools. # Current revision of Khronos Vulkan-Tools.
'vulkan_tools_revision': '17019fa2360451fb4678a6c91651eb55046aec97', 'vulkan_tools_revision': '17019fa2360451fb4678a6c91651eb55046aec97',
......
scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp": "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
"8bfd8a3857c2b9062d7ada46c7d27bcf", "8bfd8a3857c2b9062d7ada46c7d27bcf",
"third_party/vulkan-headers/src/registry/vk.xml": "third_party/vulkan-headers/src/registry/vk.xml":
"abfad8e938851e7b06c450b49b21d609" "f48f0bee41017fb21c4f69f29d1a2b7a"
} }
\ No newline at end of file
src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp
...@@ -1562,12 +1562,11 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in ...@@ -1562,12 +1562,11 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in
{ {
VkResult res; VkResult res;
VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE]; std::vector<VkDynamicState> dynamicStateEnables;
VkPipelineDynamicStateCreateInfo dynamicState = {}; VkPipelineDynamicStateCreateInfo dynamicState = {};
memset(dynamicStateEnables, 0, sizeof dynamicStateEnables);
dynamicState.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; dynamicState.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
dynamicState.pNext = NULL; dynamicState.pNext = NULL;
dynamicState.pDynamicStates = dynamicStateEnables; dynamicState.pDynamicStates = NULL;
dynamicState.dynamicStateCount = 0; dynamicState.dynamicStateCount = 0;
VkPipelineVertexInputStateCreateInfo vi; VkPipelineVertexInputStateCreateInfo vi;
...@@ -1631,12 +1630,14 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in ...@@ -1631,12 +1630,14 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in
vp.pNext = NULL; vp.pNext = NULL;
vp.flags = 0; vp.flags = 0;
#ifndef __ANDROID__ #ifndef __ANDROID__
vp.viewportCount = NUM_VIEWPORTS; vp.viewportCount = NUM_VIEWPORTS;
dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_VIEWPORT; dynamicState.dynamicStateCount++;
vp.scissorCount = NUM_SCISSORS; dynamicStateEnables.push_back(VK_DYNAMIC_STATE_VIEWPORT);
dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_SCISSOR; vp.scissorCount = NUM_SCISSORS;
vp.pScissors = NULL; dynamicState.dynamicStateCount++;
vp.pViewports = NULL; dynamicStateEnables.push_back(VK_DYNAMIC_STATE_SCISSOR);
vp.pScissors = NULL;
vp.pViewports = NULL;
#else #else
// Temporary disabling dynamic viewport on Android because some of drivers doesn't // Temporary disabling dynamic viewport on Android because some of drivers doesn't
// support the feature. // support the feature.
...@@ -1710,6 +1711,12 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in ...@@ -1710,6 +1711,12 @@ void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 in
pipeline.renderPass = info.render_pass; pipeline.renderPass = info.render_pass;
pipeline.subpass = 0; pipeline.subpass = 0;
if (dynamicStateEnables.size() > 0)
{
dynamicState.pDynamicStates = dynamicStateEnables.data();
dynamicState.dynamicStateCount = dynamicStateEnables.size();
}
res = vkCreateGraphicsPipelines(info.device, info.pipelineCache, 1, &pipeline, NULL, res = vkCreateGraphicsPipelines(info.device, info.pipelineCache, 1, &pipeline, NULL,
&info.pipeline); &info.pipeline);
ASSERT(res == VK_SUCCESS); ASSERT(res == VK_SUCCESS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment