Move packed enum code to common/

scripts/run_code_generation.py

@@ -134,16 +134,16 @@ generators = {
     },
     'packed enum': {
         'inputs': [
-            'src/libANGLE/packed_gl_enums.json',
-            'src/libANGLE/packed_egl_enums.json',
+            'src/common/packed_gl_enums.json',
+            'src/common/packed_egl_enums.json',
         ],
         'outputs': [
-            'src/libANGLE/PackedEGLEnums_autogen.cpp',
-            'src/libANGLE/PackedEGLEnums_autogen.h',
-            'src/libANGLE/PackedGLEnums_autogen.cpp',
-            'src/libANGLE/PackedGLEnums_autogen.h',
+            'src/common/PackedEGLEnums_autogen.cpp',
+            'src/common/PackedEGLEnums_autogen.h',
+            'src/common/PackedGLEnums_autogen.cpp',
+            'src/common/PackedGLEnums_autogen.h',
         ],
-        'script': 'src/libANGLE/gen_packed_gl_enums.py',
+        'script': 'src/common/gen_packed_gl_enums.py',
     },
     'proc table': {
         'inputs': [

src/libANGLE/PackedEGLEnums_autogen.cpp → src/common/PackedEGLEnums_autogen.cpp

@@ -9,7 +9,7 @@
 //   Implements ANGLE-specific enums classes for EGLenums and functions operating
 //   on them.
 
-#include "libANGLE/PackedEGLEnums_autogen.h"
+#include "common/PackedEGLEnums_autogen.h"
 #include "common/debug.h"
 
 namespace egl

src/libANGLE/PackedEGLEnums_autogen.h → src/common/PackedEGLEnums_autogen.h

@@ -9,8 +9,8 @@
 //   Declares ANGLE-specific enums classes for EGLenums and functions operating
 //   on them.
 
-#ifndef LIBANGLE_PACKEDEGLENUMS_AUTOGEN_H_
-#define LIBANGLE_PACKEDEGLENUMS_AUTOGEN_H_
+#ifndef COMMON_PACKEDEGLENUMS_AUTOGEN_H_
+#define COMMON_PACKEDEGLENUMS_AUTOGEN_H_
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -40,4 +40,4 @@ EGLenum ToEGLenum(TextureFormat from);
 
 }  // namespace egl
 
-#endif  // LIBANGLE_PACKEDEGLENUMS_AUTOGEN_H_
+#endif  // COMMON_PACKEDEGLENUMS_AUTOGEN_H_

src/libANGLE/PackedEnums.cpp → src/common/PackedEnums.cpp

@@ -6,7 +6,7 @@
 //   Declares ANGLE-specific enums classes for GLEnum and functions operating
 //   on them.
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 
 #include "common/utilities.h"
 

src/libANGLE/PackedEnums.h → src/common/PackedEnums.h

@@ -6,11 +6,11 @@
 //   Declares ANGLE-specific enums classes for GLEnum and functions operating
 //   on them.
 
-#ifndef LIBANGLE_PACKEDGLENUMS_H_
-#define LIBANGLE_PACKEDGLENUMS_H_
+#ifndef COMMON_PACKEDGLENUMS_H_
+#define COMMON_PACKEDGLENUMS_H_
 
-#include "libANGLE/PackedEGLEnums_autogen.h"
-#include "libANGLE/PackedGLEnums_autogen.h"
+#include "common/PackedEGLEnums_autogen.h"
+#include "common/PackedGLEnums_autogen.h"
 
 #include <array>
 #include <bitset>
@@ -194,4 +194,4 @@ gl::TextureTarget EGLImageTargetToTextureTarget(EGLenum eglTarget);
 gl::TextureType EGLTextureTargetToTextureType(EGLenum eglTarget);
 }  // namespace egl_gl
 
-#endif  // LIBANGLE_PACKEDGLENUMS_H_
+#endif  // COMMON_PACKEDGLENUMS_H_

src/libANGLE/PackedGLEnums_autogen.cpp → src/common/PackedGLEnums_autogen.cpp

@@ -9,7 +9,7 @@
 //   Implements ANGLE-specific enums classes for GLenums and functions operating
 //   on them.
 
-#include "libANGLE/PackedGLEnums_autogen.h"
+#include "common/PackedGLEnums_autogen.h"
 #include "common/debug.h"
 
 namespace gl

src/libANGLE/PackedGLEnums_autogen.h → src/common/PackedGLEnums_autogen.h

@@ -9,8 +9,8 @@
 //   Declares ANGLE-specific enums classes for GLenums and functions operating
 //   on them.
 
-#ifndef LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
-#define LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
+#ifndef COMMON_PACKEDGLENUMS_AUTOGEN_H_
+#define COMMON_PACKEDGLENUMS_AUTOGEN_H_
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -395,4 +395,4 @@ GLenum ToGLenum(VertexArrayType from);
 
 }  // namespace gl
 
-#endif  // LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
+#endif  // COMMON_PACKEDGLENUMS_AUTOGEN_H_

src/libANGLE/gen_packed_gl_enums.py → src/common/gen_packed_gl_enums.py

@@ -71,8 +71,8 @@ header_template = """// GENERATED FILE - DO NOT EDIT.
 //   Declares ANGLE-specific enums classes for {api_enum_name}s and functions operating
 //   on them.
 
-#ifndef LIBANGLE_{include_guard}_
-#define LIBANGLE_{include_guard}_
+#ifndef COMMON_{include_guard}_
+#define COMMON_{include_guard}_
 
 #include <angle_gl.h>
 #include <EGL/egl.h>
@@ -88,7 +88,7 @@ Enum From{api_enum_name}({api_enum_name} from);
 {content}
 }}  // namespace {namespace}
 
-#endif // LIBANGLE_{include_guard}_
+#endif // COMMON_{include_guard}_
 """
 
 enum_declaration_template = """
@@ -146,7 +146,7 @@ cpp_template = """// GENERATED FILE - DO NOT EDIT.
 //   on them.
 
 #include "common/debug.h"
-#include "libANGLE/{header_name}"
+#include "common/{header_name}"
 
 namespace {namespace}
 {{

src/libANGLE/AttributeMap.h

@@ -7,7 +7,7 @@
 #ifndef LIBANGLE_ATTRIBUTEMAP_H_
 #define LIBANGLE_ATTRIBUTEMAP_H_
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 
 #include <EGL/egl.h>
 

src/libANGLE/Buffer.h

@@ -11,11 +11,11 @@
 #ifndef LIBANGLE_BUFFER_H_
 #define LIBANGLE_BUFFER_H_
 
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "libANGLE/Debug.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/IndexRangeCache.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 
 namespace rx

src/libANGLE/Compiler.h

@@ -11,8 +11,8 @@
 #define LIBANGLE_COMPILER_H_
 
 #include "GLSLANG/ShaderLang.h"
+#include "common/PackedEnums.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 
 namespace rx

src/libANGLE/Context.h

@@ -15,6 +15,7 @@
 
 #include "angle_gl.h"
 #include "common/MemoryBuffer.h"
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "libANGLE/Caps.h"
 #include "libANGLE/Constants.h"
@@ -22,7 +23,6 @@
 #include "libANGLE/Context_gles_1_0_autogen.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/HandleAllocator.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 #include "libANGLE/ResourceMap.h"
 #include "libANGLE/VertexAttribute.h"

src/libANGLE/ImageIndex.h

@@ -9,8 +9,8 @@
 #ifndef LIBANGLE_IMAGE_INDEX_H_
 #define LIBANGLE_IMAGE_INDEX_H_
 
+#include "common/PackedEnums.h"
 #include "common/mathutil.h"
-#include "libANGLE/PackedEnums.h"
 
 #include "angle_gl.h"
 

src/libANGLE/ProgramLinkedResources.h

@@ -12,8 +12,8 @@
 #define LIBANGLE_UNIFORMLINKER_H_
 
 #include "angle_gl.h"
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/VaryingPacking.h"
 
 #include <functional>

src/libANGLE/Query.h

@@ -9,9 +9,9 @@
 #ifndef LIBANGLE_QUERY_H_
 #define LIBANGLE_QUERY_H_
 
+#include "common/PackedEnums.h"
 #include "libANGLE/Debug.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 
 #include "common/angleutils.h"

src/libANGLE/Surface.h

@@ -13,11 +13,11 @@
 
 #include <EGL/egl.h>
 
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "libANGLE/AttributeMap.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/FramebufferAttachment.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/SurfaceImpl.h"

src/libANGLE/angletypes.h

@@ -10,11 +10,11 @@
 #define LIBANGLE_ANGLETYPES_H_
 
 #include "common/Color.h"
+#include "common/PackedEnums.h"
 #include "common/bitset_utils.h"
 #include "common/vector_utils.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/RefCountObject.h"
 
 #include <stdint.h>

src/libANGLE/queryutils.h

@@ -10,8 +10,8 @@
 #define LIBANGLE_QUERYUTILS_H_
 
 #include "angle_gl.h"
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
-#include "libANGLE/PackedEnums.h"
 
 #include <EGL/egl.h>
 

src/libANGLE/renderer/BufferImpl.h

@@ -9,11 +9,11 @@
 #ifndef LIBANGLE_RENDERER_BUFFERIMPL_H_
 #define LIBANGLE_RENDERER_BUFFERIMPL_H_
 
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "common/mathutil.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/Observer.h"
-#include "libANGLE/PackedEnums.h"
 
 #include <stdint.h>
 

src/libANGLE/renderer/QueryImpl.h

@@ -9,10 +9,9 @@
 #ifndef LIBANGLE_RENDERER_QUERYIMPL_H_
 #define LIBANGLE_RENDERER_QUERYIMPL_H_
 
-
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 
 namespace rx
 {

src/libANGLE/renderer/d3d/ImageD3D.h

@@ -13,8 +13,8 @@
 
 #include "common/debug.h"
 
+#include "common/PackedEnums.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 
 namespace gl
 {

src/libANGLE/renderer/d3d/d3d9/Blit9.h

@@ -9,9 +9,9 @@
 #ifndef LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
 #define LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
 
+#include "common/PackedEnums.h"
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/PackedEnums.h"
 
 namespace gl
 {

src/libANGLE/renderer/vulkan/vk_internal_shaders.h

@@ -9,7 +9,7 @@
 #ifndef LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_H_
 #define LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_H_
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 #include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
 #include "libANGLE/renderer/vulkan/vk_utils.h"
 

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -15,10 +15,10 @@
 #include <vulkan/vulkan.h>
 
 #include "common/Optional.h"
+#include "common/PackedEnums.h"
 #include "common/debug.h"
 #include "libANGLE/Error.h"
 #include "libANGLE/Observer.h"
-#include "libANGLE/PackedEnums.h"
 #include "libANGLE/renderer/renderer_utils.h"
 
 #define ANGLE_GL_OBJECTS_X(PROC) \

src/libANGLE/validationES.h

@@ -9,10 +9,10 @@
 #ifndef LIBANGLE_VALIDATION_ES_H_
 #define LIBANGLE_VALIDATION_ES_H_
 
+#include "common/PackedEnums.h"
 #include "common/mathutil.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Framebuffer.h"
-#include "libANGLE/PackedEnums.h"
 
 #include <GLES2/gl2.h>
 #include <GLES3/gl3.h>

src/libANGLE/validationES2.h

@@ -9,7 +9,7 @@
 #ifndef LIBANGLE_VALIDATION_ES2_H_
 #define LIBANGLE_VALIDATION_ES2_H_
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>

src/libANGLE/validationES3.h

@@ -9,7 +9,7 @@
 #ifndef LIBANGLE_VALIDATION_ES3_H_
 #define LIBANGLE_VALIDATION_ES3_H_
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 
 #include <GLES3/gl3.h>
 

src/libANGLE/validationES31.h

@@ -9,7 +9,7 @@
 #ifndef LIBANGLE_VALIDATION_ES31_H_
 #define LIBANGLE_VALIDATION_ES31_H_
 
-#include "libANGLE/PackedEnums.h"
+#include "common/PackedEnums.h"
 
 #include <GLES3/gl31.h>
 

src/libGLESv2.gypi

@@ -15,6 +15,12 @@
             'common/MemoryBuffer.cpp',
             'common/MemoryBuffer.h',
             'common/Optional.h',
+            'common/PackedEGLEnums_autogen.cpp',
+            'common/PackedEGLEnums_autogen.h',
+            'common/PackedEnums.cpp',
+            'common/PackedEnums.h',
+            'common/PackedGLEnums_autogen.cpp',
+            'common/PackedGLEnums_autogen.h',
             'common/aligned_memory.cpp',
             'common/aligned_memory.h',
             'common/angleutils.cpp',
@@ -191,12 +197,6 @@
             'libANGLE/MemoryProgramCache.h',
             'libANGLE/Observer.cpp',
             'libANGLE/Observer.h',
-            'libANGLE/PackedEGLEnums_autogen.cpp',
-            'libANGLE/PackedEGLEnums_autogen.h',
-            'libANGLE/PackedEnums.cpp',
-            'libANGLE/PackedEnums.h',
-            'libANGLE/PackedGLEnums_autogen.cpp',
-            'libANGLE/PackedGLEnums_autogen.h',
             'libANGLE/Path.h',
             'libANGLE/Path.cpp',
             'libANGLE/Platform.cpp',