Skip to content

A
angle
Commit 6c824a1b by Michael Spang Committed by Commit Bot
Options

Vulkan: Add missing layout for VK_IMAGE_LAYOUT_UNDEFINED

This this was missed because it doesn't add its own enum value and instead reuses GL_NONE. Bug: chromium:976374 Test: chrome --enable-features=UseSkiaRenderer,UiGpuRasterization \ --enable-gpu-rasterization \ --enable-oop-rasterization \ --use-vulkan=native \ --use-gl=angle \ --use-angle=vulkan Change-Id: I73437211fef3253801e899cb6e50a8e18865cc65 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1665329 Commit-Queue: Michael Spang <spang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 9a4bd48d
Showing with 22 additions and 15 deletions
scripts/run_code_generation_hashes.json
...@@ -442,15 +442,15 @@ ...@@ -442,15 +442,15 @@
"packed enum:src/common/PackedEGLEnums_autogen.h": "packed enum:src/common/PackedEGLEnums_autogen.h":
"4073274726e0c926765c5ab8b21dc3de", "4073274726e0c926765c5ab8b21dc3de",
"packed enum:src/common/PackedGLEnums_autogen.cpp": "packed enum:src/common/PackedGLEnums_autogen.cpp":
"0e3a0ded47594dd6d8a324dbc9d033f3", "0968e9a68f277d1b7d4c43baed605802",
"packed enum:src/common/PackedGLEnums_autogen.h": "packed enum:src/common/PackedGLEnums_autogen.h":
"89396fc19b94f0fd48739b841ae172a8", "c4229059d3e46601148dce802e198ca4",
"packed enum:src/common/gen_packed_gl_enums.py": "packed enum:src/common/gen_packed_gl_enums.py":
"cc463afc5e37b0f73e119fec59a39420", "cc463afc5e37b0f73e119fec59a39420",
"packed enum:src/common/packed_egl_enums.json": "packed enum:src/common/packed_egl_enums.json":
"5f591d220ee53b6e54a27d1523a3ab79", "5f591d220ee53b6e54a27d1523a3ab79",
"packed enum:src/common/packed_gl_enums.json": "packed enum:src/common/packed_gl_enums.json":
"3f730faeebe986cd3017432ad56cf203", "b60dd9e7a25717f5b15015f6edc8b058",
"proc table:scripts/egl.xml": "proc table:scripts/egl.xml":
"842e24514c4cfe09fba703c17a0fd292", "842e24514c4cfe09fba703c17a0fd292",
"proc table:scripts/egl_angle_ext.xml": "proc table:scripts/egl_angle_ext.xml":
......
src/common/PackedGLEnums_autogen.cpp
...@@ -432,6 +432,8 @@ ImageLayout FromGLenum<ImageLayout>(GLenum from) ...@@ -432,6 +432,8 @@ ImageLayout FromGLenum<ImageLayout>(GLenum from)
{ {
switch (from) switch (from)
{ {
case GL_NONE:
return ImageLayout::Undefined;
case GL_LAYOUT_GENERAL_EXT: case GL_LAYOUT_GENERAL_EXT:
return ImageLayout::General; return ImageLayout::General;
case GL_LAYOUT_COLOR_ATTACHMENT_EXT: case GL_LAYOUT_COLOR_ATTACHMENT_EXT:
...@@ -459,6 +461,8 @@ GLenum ToGLenum(ImageLayout from) ...@@ -459,6 +461,8 @@ GLenum ToGLenum(ImageLayout from)
{ {
switch (from) switch (from)
{ {
case ImageLayout::Undefined:
return GL_NONE;
case ImageLayout::General: case ImageLayout::General:
return GL_LAYOUT_GENERAL_EXT; return GL_LAYOUT_GENERAL_EXT;
case ImageLayout::ColorAttachment: case ImageLayout::ColorAttachment:
......
src/common/PackedGLEnums_autogen.h
...@@ -189,18 +189,19 @@ GLenum ToGLenum(HintSetting from); ...@@ -189,18 +189,19 @@ GLenum ToGLenum(HintSetting from);
enum class ImageLayout : uint8_t enum class ImageLayout : uint8_t
{ {
General = 0, Undefined = 0,
ColorAttachment = 1, General = 1,
DepthStencilAttachment = 2, ColorAttachment = 2,
DepthStencilReadOnlyAttachment = 3, DepthStencilAttachment = 3,
ShaderReadOnly = 4, DepthStencilReadOnlyAttachment = 4,
TransferSrc = 5, ShaderReadOnly = 5,
TransferDst = 6, TransferSrc = 6,
DepthReadOnlyStencilAttachment = 7, TransferDst = 7,
DepthAttachmentStencilReadOnly = 8, DepthReadOnlyStencilAttachment = 8,
DepthAttachmentStencilReadOnly = 9,
InvalidEnum = 9,
EnumCount = 9, InvalidEnum = 10,
EnumCount = 10,
}; };
template <> template <>
......
src/common/packed_gl_enums.json
...@@ -269,6 +269,7 @@ ...@@ -269,6 +269,7 @@
}, },
"ImageLayout": "ImageLayout":
{ {
"Undefined": "GL_NONE",
"General": "GL_LAYOUT_GENERAL_EXT", "General": "GL_LAYOUT_GENERAL_EXT",
"ColorAttachment": "GL_LAYOUT_COLOR_ATTACHMENT_EXT", "ColorAttachment": "GL_LAYOUT_COLOR_ATTACHMENT_EXT",
"DepthStencilAttachment": "GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT", "DepthStencilAttachment": "GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT",
......
src/libANGLE/validationES2.cpp
...@@ -1129,6 +1129,7 @@ bool IsValidImageLayout(ImageLayout layout) ...@@ -1129,6 +1129,7 @@ bool IsValidImageLayout(ImageLayout layout)
{ {
switch (layout) switch (layout)
{ {
case ImageLayout::Undefined:
case ImageLayout::General: case ImageLayout::General:
case ImageLayout::ColorAttachment: case ImageLayout::ColorAttachment:
case ImageLayout::DepthStencilAttachment: case ImageLayout::DepthStencilAttachment:
......
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