Add packed enum for GL_EXT_semaphore image layouts

scripts/run_code_generation_hashes.json

@@ -368,15 +368,15 @@
   "packed enum:src/common/PackedEGLEnums_autogen.h":
     "4073274726e0c926765c5ab8b21dc3de",
   "packed enum:src/common/PackedGLEnums_autogen.cpp":
-    "41faf7a2b9b7a5008269f3e57bbe361d",
+    "0e3a0ded47594dd6d8a324dbc9d033f3",
   "packed enum:src/common/PackedGLEnums_autogen.h":
-    "0766f2bb7874b2b6b4aaed4a6d0ef49e",
+    "89396fc19b94f0fd48739b841ae172a8",
   "packed enum:src/common/gen_packed_gl_enums.py":
     "cc463afc5e37b0f73e119fec59a39420",
   "packed enum:src/common/packed_egl_enums.json":
     "5f591d220ee53b6e54a27d1523a3ab79",
   "packed enum:src/common/packed_gl_enums.json":
-    "cd2c00958dd8cc546b816dedaf4769d3",
+    "3f730faeebe986cd3017432ad56cf203",
   "proc table:src/libGLESv2/gen_proc_table.py":
     "3be3e8ed7fad58e8cc6fcf348da7b17d",
   "proc table:src/libGLESv2/proc_table_autogen.cpp":

src/common/PackedGLEnums_autogen.cpp

@@ -428,6 +428,62 @@ GLenum ToGLenum(HintSetting from)
 }
 
 template <>
+ImageLayout FromGLenum<ImageLayout>(GLenum from)
+{
+    switch (from)
+    {
+        case GL_LAYOUT_GENERAL_EXT:
+            return ImageLayout::General;
+        case GL_LAYOUT_COLOR_ATTACHMENT_EXT:
+            return ImageLayout::ColorAttachment;
+        case GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT:
+            return ImageLayout::DepthStencilAttachment;
+        case GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT:
+            return ImageLayout::DepthStencilReadOnlyAttachment;
+        case GL_LAYOUT_SHADER_READ_ONLY_EXT:
+            return ImageLayout::ShaderReadOnly;
+        case GL_LAYOUT_TRANSFER_SRC_EXT:
+            return ImageLayout::TransferSrc;
+        case GL_LAYOUT_TRANSFER_DST_EXT:
+            return ImageLayout::TransferDst;
+        case GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT:
+            return ImageLayout::DepthReadOnlyStencilAttachment;
+        case GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT:
+            return ImageLayout::DepthAttachmentStencilReadOnly;
+        default:
+            return ImageLayout::InvalidEnum;
+    }
+}
+
+GLenum ToGLenum(ImageLayout from)
+{
+    switch (from)
+    {
+        case ImageLayout::General:
+            return GL_LAYOUT_GENERAL_EXT;
+        case ImageLayout::ColorAttachment:
+            return GL_LAYOUT_COLOR_ATTACHMENT_EXT;
+        case ImageLayout::DepthStencilAttachment:
+            return GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT;
+        case ImageLayout::DepthStencilReadOnlyAttachment:
+            return GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT;
+        case ImageLayout::ShaderReadOnly:
+            return GL_LAYOUT_SHADER_READ_ONLY_EXT;
+        case ImageLayout::TransferSrc:
+            return GL_LAYOUT_TRANSFER_SRC_EXT;
+        case ImageLayout::TransferDst:
+            return GL_LAYOUT_TRANSFER_DST_EXT;
+        case ImageLayout::DepthReadOnlyStencilAttachment:
+            return GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT;
+        case ImageLayout::DepthAttachmentStencilReadOnly:
+            return GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT;
+        default:
+            UNREACHABLE();
+            return 0;
+    }
+}
+
+template <>
 LightParameter FromGLenum<LightParameter>(GLenum from)
 {
     switch (from)

src/common/PackedGLEnums_autogen.h

@@ -187,6 +187,26 @@ template <>
 HintSetting FromGLenum<HintSetting>(GLenum from);
 GLenum ToGLenum(HintSetting from);
 
+enum class ImageLayout : uint8_t
+{
+    General                        = 0,
+    ColorAttachment                = 1,
+    DepthStencilAttachment         = 2,
+    DepthStencilReadOnlyAttachment = 3,
+    ShaderReadOnly                 = 4,
+    TransferSrc                    = 5,
+    TransferDst                    = 6,
+    DepthReadOnlyStencilAttachment = 7,
+    DepthAttachmentStencilReadOnly = 8,
+
+    InvalidEnum = 9,
+    EnumCount   = 9,
+};
+
+template <>
+ImageLayout FromGLenum<ImageLayout>(GLenum from);
+GLenum ToGLenum(ImageLayout from);
+
 enum class LightParameter : uint8_t
 {
     Ambient              = 0,

src/common/packed_gl_enums.json

@@ -266,5 +266,17 @@
     "HandleType":
     {
         "OpaqueFd": "GL_HANDLE_TYPE_OPAQUE_FD_EXT"
+    },
+    "ImageLayout":
+    {
+        "General": "GL_LAYOUT_GENERAL_EXT",
+        "ColorAttachment": "GL_LAYOUT_COLOR_ATTACHMENT_EXT",
+        "DepthStencilAttachment": "GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT",
+        "DepthStencilReadOnlyAttachment": "GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT",
+        "ShaderReadOnly": "GL_LAYOUT_SHADER_READ_ONLY_EXT",
+        "TransferSrc": "GL_LAYOUT_TRANSFER_SRC_EXT",
+        "TransferDst": "GL_LAYOUT_TRANSFER_DST_EXT",
+        "DepthReadOnlyStencilAttachment": "GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT",
+        "DepthAttachmentStencilReadOnly": "GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT"
     }
 }