Remove support for compiling libANGLE as a dynamic library.

BUILD.gn

@@ -162,7 +162,7 @@ if (is_win) {
     ]
   }
 
-  shared_library("libANGLE") {
+  static_library("libANGLE") {
     sources = rebase_path(gles_gypi.libangle_sources, ".", "src")
     sources += rebase_path(gles_gypi.libangle_common_sources, ".", "src")
 

src/libANGLE/AttributeMap.h

@@ -7,7 +7,6 @@
 #ifndef LIBANGLE_ATTRIBUTEMAP_H_
 #define LIBANGLE_ATTRIBUTEMAP_H_
 
-#include "libANGLE/export.h"
 
 #include <EGL/egl.h>
 
@@ -16,7 +15,7 @@
 namespace egl
 {
 
-class ANGLE_EXPORT AttributeMap
+class AttributeMap
 {
   public:
     AttributeMap();

src/libANGLE/Buffer.h

@@ -12,7 +12,6 @@
 #define LIBANGLE_BUFFER_H_
 
 #include "libANGLE/Error.h"
-#include "libANGLE/export.h"
 #include "libANGLE/RefCountObject.h"
 #include "libANGLE/renderer/IndexRangeCache.h"
 
@@ -26,7 +25,7 @@ class BufferImpl;
 namespace gl
 {
 
-class ANGLE_EXPORT Buffer : public RefCountObject
+class Buffer : public RefCountObject
 {
   public:
     Buffer(rx::BufferImpl *impl, GLuint id);

src/libANGLE/Caps.h

@@ -7,8 +7,6 @@
 #ifndef LIBANGLE_CAPS_H_
 #define LIBANGLE_CAPS_H_
 
-#include "libANGLE/export.h"
-
 #include "angle_gl.h"
 
 #include <set>
@@ -21,7 +19,7 @@ namespace gl
 
 typedef std::set<GLuint> SupportedSampleSet;
 
-struct ANGLE_EXPORT TextureCaps
+struct TextureCaps
 {
     TextureCaps();
 
@@ -44,7 +42,7 @@ struct ANGLE_EXPORT TextureCaps
     GLuint getNearestSamples(GLuint requestedSamples) const;
 };
 
-class ANGLE_EXPORT TextureCapsMap
+class TextureCapsMap
 {
   public:
     typedef std::unordered_map<GLenum, TextureCaps>::const_iterator const_iterator;
@@ -64,7 +62,7 @@ class ANGLE_EXPORT TextureCapsMap
     InternalFormatToCapsMap mCapsMap;
 };
 
-struct ANGLE_EXPORT Extensions
+struct Extensions
 {
     Extensions();
 
@@ -216,7 +214,7 @@ struct ANGLE_EXPORT Extensions
     bool colorBufferFloat;
 };
 
-struct ANGLE_EXPORT Caps
+struct Caps
 {
     Caps();
 

src/libANGLE/Config.h

@@ -12,7 +12,6 @@
 #define INCLUDE_CONFIG_H_
 
 #include "libANGLE/renderer/Renderer.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -24,7 +23,7 @@ namespace egl
 {
 class Display;
 
-class ANGLE_EXPORT Config
+class Config
 {
   public:
     Config(rx::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight);

src/libANGLE/Context.h

@@ -19,7 +19,6 @@
 #include "libANGLE/HandleAllocator.h"
 #include "libANGLE/VertexAttribute.h"
 #include "libANGLE/angletypes.h"
-#include "libANGLE/export.h"
 
 #include "angle_gl.h"
 
@@ -60,7 +59,7 @@ class VertexArray;
 class Sampler;
 class TransformFeedback;
 
-class ANGLE_EXPORT Context
+class Context
 {
   public:
     Context(int clientVersion, const Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess);

src/libANGLE/Data.h

@@ -10,12 +10,11 @@
 #define LIBANGLE_DATA_H_
 
 #include "libANGLE/State.h"
-#include "libANGLE/export.h"
 
 namespace gl
 {
 
-struct ANGLE_EXPORT Data final
+struct Data final
 {
   public:
     Data(GLint clientVersion, const State &state, const Caps &caps,

src/libANGLE/Display.h

@@ -17,7 +17,6 @@
 #include "libANGLE/Error.h"
 #include "libANGLE/Config.h"
 #include "libANGLE/AttributeMap.h"
-#include "libANGLE/export.h"
 
 namespace gl
 {
@@ -33,7 +32,7 @@ namespace egl
 {
 class Surface;
 
-class ANGLE_EXPORT Display
+class Display
 {
   public:
     ~Display();

src/libANGLE/Error.h

@@ -9,8 +9,6 @@
 #ifndef LIBANGLE_ERROR_H_
 #define LIBANGLE_ERROR_H_
 
-#include "libANGLE/export.h"
-
 #include "angle_gl.h"
 #include <EGL/egl.h>
 
@@ -19,7 +17,7 @@
 namespace gl
 {
 
-class ANGLE_EXPORT Error
+class Error
 {
   public:
     explicit Error(GLenum errorCode);
@@ -42,7 +40,7 @@ class ANGLE_EXPORT Error
 namespace egl
 {
 
-class ANGLE_EXPORT Error
+class Error
 {
   public:
     explicit Error(EGLint errorCode);

src/libANGLE/Fence.h

@@ -12,7 +12,6 @@
 
 #include "libANGLE/Error.h"
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -25,7 +24,7 @@ class FenceSyncImpl;
 namespace gl
 {
 
-class ANGLE_EXPORT FenceNV
+class FenceNV
 {
   public:
     explicit FenceNV(rx::FenceNVImpl *impl);
@@ -50,7 +49,7 @@ class ANGLE_EXPORT FenceNV
     GLenum mCondition;
 };
 
-class ANGLE_EXPORT FenceSync : public RefCountObject
+class FenceSync : public RefCountObject
 {
   public:
     explicit FenceSync(rx::FenceSyncImpl *impl, GLuint id);

src/libANGLE/Framebuffer.h

@@ -13,7 +13,6 @@
 #include "libANGLE/Error.h"
 #include "libANGLE/RefCountObject.h"
 #include "libANGLE/Constants.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -40,7 +39,7 @@ struct Data;
 
 typedef std::vector<FramebufferAttachment *> ColorbufferInfo;
 
-class ANGLE_EXPORT Framebuffer
+class Framebuffer
 {
   public:
     Framebuffer(rx::FramebufferImpl *impl, GLuint id);

src/libANGLE/FramebufferAttachment.h

@@ -12,7 +12,6 @@
 
 #include "libANGLE/Texture.h"
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -33,7 +32,7 @@ class Renderbuffer;
 // Note: Our old naming scheme used the term "Renderbuffer" for both GL renderbuffers and for
 // framebuffer attachments, which confused their usage.
 
-class ANGLE_EXPORT FramebufferAttachment
+class FramebufferAttachment
 {
   public:
     explicit FramebufferAttachment(GLenum binding);
@@ -77,7 +76,7 @@ class ANGLE_EXPORT FramebufferAttachment
     GLenum mBinding;
 };
 
-class ANGLE_EXPORT TextureAttachment : public FramebufferAttachment
+class TextureAttachment : public FramebufferAttachment
 {
   public:
     TextureAttachment(GLenum binding, Texture *texture, const ImageIndex &index);
@@ -107,7 +106,7 @@ class ANGLE_EXPORT TextureAttachment : public FramebufferAttachment
     ImageIndex mIndex;
 };
 
-class ANGLE_EXPORT RenderbufferAttachment : public FramebufferAttachment
+class RenderbufferAttachment : public FramebufferAttachment
 {
   public:
     RenderbufferAttachment(GLenum binding, Renderbuffer *renderbuffer);
@@ -136,7 +135,7 @@ class ANGLE_EXPORT RenderbufferAttachment : public FramebufferAttachment
     BindingPointer<Renderbuffer> mRenderbuffer;
 };
 
-class ANGLE_EXPORT DefaultAttachment : public FramebufferAttachment
+class DefaultAttachment : public FramebufferAttachment
 {
   public:
     DefaultAttachment(GLenum binding, rx::DefaultAttachmentImpl *impl);

src/libANGLE/ImageIndex.h

@@ -9,8 +9,6 @@
 #ifndef LIBANGLE_IMAGE_INDEX_H_
 #define LIBANGLE_IMAGE_INDEX_H_
 
-#include "libANGLE/export.h"
-
 #include "common/mathutil.h"
 
 #include "angle_gl.h"
@@ -18,7 +16,7 @@
 namespace gl
 {
 
-struct ANGLE_EXPORT ImageIndex
+struct ImageIndex
 {
     GLenum type;
     GLint mipIndex;
@@ -39,7 +37,7 @@ struct ANGLE_EXPORT ImageIndex
     static const GLint ENTIRE_LEVEL = static_cast<GLint>(-1);
 };
 
-class ANGLE_EXPORT ImageIndexIterator
+class ImageIndexIterator
 {
   public:
     static ImageIndexIterator Make2D(GLint minMip, GLint maxMip);

src/libANGLE/Program.h

@@ -13,7 +13,6 @@
 #include "libANGLE/angletypes.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/export.h"
 #include "libANGLE/RefCountObject.h"
 
 #include "common/angleutils.h"
@@ -62,7 +61,7 @@ class AttributeBindings
     std::set<std::string> mAttributeBinding[MAX_VERTEX_ATTRIBS];
 };
 
-class ANGLE_EXPORT InfoLog
+class InfoLog
 {
   public:
     InfoLog();
@@ -108,7 +107,7 @@ struct LinkedVarying
     unsigned int semanticIndexCount;
 };
 
-class ANGLE_EXPORT Program
+class Program
 {
   public:
     Program(rx::ProgramImpl *impl, ResourceManager *manager, GLuint handle);

src/libANGLE/Query.h

@@ -11,7 +11,6 @@
 
 #include "libANGLE/Error.h"
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -25,7 +24,7 @@ class QueryImpl;
 namespace gl
 {
 
-class ANGLE_EXPORT Query : public RefCountObject
+class Query : public RefCountObject
 {
   public:
     Query(rx::QueryImpl *impl, GLuint id);

src/libANGLE/RefCountObject.h

@@ -12,15 +12,13 @@
 #ifndef LIBANGLE_REFCOUNTOBJECT_H_
 #define LIBANGLE_REFCOUNTOBJECT_H_
 
-#include "libANGLE/export.h"
-
 #include "common/debug.h"
 
 #include "angle_gl.h"
 
 #include <cstddef>
 
-class ANGLE_EXPORT RefCountObject
+class RefCountObject
 {
   public:
     explicit RefCountObject(GLuint id);

src/libANGLE/Renderbuffer.h

@@ -15,7 +15,6 @@
 
 #include "libANGLE/Error.h"
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -33,7 +32,7 @@ class FramebufferAttachment;
 // FramebufferAttachment and Framebuffer for how they are applied to an FBO via an
 // attachment point.
 
-class ANGLE_EXPORT Renderbuffer : public RefCountObject
+class Renderbuffer : public RefCountObject
 {
   public:
     Renderbuffer(rx::RenderbufferImpl *impl, GLuint id);

src/libANGLE/Sampler.h

@@ -11,13 +11,12 @@
 #define LIBANGLE_SAMPLER_H_
 
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 namespace gl
 {
 struct SamplerState;
 
-class ANGLE_EXPORT Sampler : public RefCountObject
+class Sampler : public RefCountObject
 {
   public:
     Sampler(GLuint id);

src/libANGLE/Shader.h

@@ -21,7 +21,6 @@
 
 #include "common/angleutils.h"
 #include "libANGLE/angletypes.h"
-#include "libANGLE/export.h"
 
 namespace rx
 {
@@ -53,7 +52,7 @@ struct PackedVarying : public sh::Varying
     }
 };
 
-class ANGLE_EXPORT Shader
+class Shader
 {
   public:
     Shader(ResourceManager *manager, rx::ShaderImpl *impl, GLenum type, GLuint handle);

src/libANGLE/State.h

@@ -18,7 +18,6 @@
 #include "libANGLE/TransformFeedback.h"
 #include "libANGLE/Program.h"
 #include "libANGLE/Sampler.h"
-#include "libANGLE/export.h"
 
 namespace gl
 {
@@ -30,7 +29,7 @@ struct Data;
 
 typedef std::map< GLenum, BindingPointer<Texture> > TextureMap;
 
-class ANGLE_EXPORT State
+class State
 {
   public:
     State();

src/libANGLE/Surface.h

@@ -13,7 +13,6 @@
 
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/export.h"
 
 #include <EGL/egl.h>
 
@@ -32,7 +31,7 @@ namespace egl
 class Display;
 class Config;
 
-class ANGLE_EXPORT Surface final
+class Surface final
 {
   public:
     Surface(rx::SurfaceImpl *impl);

src/libANGLE/Texture.h

@@ -17,7 +17,6 @@
 #include "libANGLE/Constants.h"
 #include "libANGLE/renderer/TextureImpl.h"
 #include "libANGLE/Caps.h"
-#include "libANGLE/export.h"
 
 #include "angle_gl.h"
 
@@ -42,7 +41,7 @@ struct ImageIndex;
 
 bool IsMipmapFiltered(const gl::SamplerState &samplerState);
 
-class ANGLE_EXPORT Texture : public RefCountObject
+class Texture : public RefCountObject
 {
   public:
     Texture(rx::TextureImpl *impl, GLuint id, GLenum target);
@@ -106,7 +105,7 @@ class ANGLE_EXPORT Texture : public RefCountObject
     DISALLOW_COPY_AND_ASSIGN(Texture);
 };
 
-class ANGLE_EXPORT Texture2D : public Texture
+class Texture2D : public Texture
 {
   public:
     Texture2D(rx::TextureImpl *impl, GLuint id);
@@ -142,7 +141,7 @@ class ANGLE_EXPORT Texture2D : public Texture
     egl::Surface *mSurface;
 };
 
-class ANGLE_EXPORT TextureCubeMap : public Texture
+class TextureCubeMap : public Texture
 {
   public:
     TextureCubeMap(rx::TextureImpl *impl, GLuint id);
@@ -177,7 +176,7 @@ class ANGLE_EXPORT TextureCubeMap : public Texture
     bool isFaceLevelComplete(int faceIndex, int level) const;
 };
 
-class ANGLE_EXPORT Texture3D : public Texture
+class Texture3D : public Texture
 {
   public:
     Texture3D(rx::TextureImpl *impl, GLuint id);
@@ -207,7 +206,7 @@ class ANGLE_EXPORT Texture3D : public Texture
     bool isLevelComplete(int level) const;
 };
 
-class ANGLE_EXPORT Texture2DArray : public Texture
+class Texture2DArray : public Texture
 {
   public:
     Texture2DArray(rx::TextureImpl *impl, GLuint id);

src/libANGLE/TransformFeedback.h

@@ -8,7 +8,6 @@
 #define LIBANGLE_TRANSFORM_FEEDBACK_H_
 
 #include "libANGLE/RefCountObject.h"
-#include "libANGLE/export.h"
 
 #include "common/angleutils.h"
 
@@ -22,7 +21,7 @@ class TransformFeedbackImpl;
 namespace gl
 {
 
-class ANGLE_EXPORT TransformFeedback : public RefCountObject
+class TransformFeedback : public RefCountObject
 {
   public:
     TransformFeedback(rx::TransformFeedbackImpl* impl, GLuint id);

src/libANGLE/VertexArray.h

@@ -16,7 +16,6 @@
 #include "libANGLE/RefCountObject.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/VertexAttribute.h"
-#include "libANGLE/export.h"
 
 #include <vector>
 
@@ -29,7 +28,7 @@ namespace gl
 {
 class Buffer;
 
-class ANGLE_EXPORT VertexArray
+class VertexArray
 {
   public:
     VertexArray(rx::VertexArrayImpl *impl, GLuint id, size_t maxAttribs);

src/libANGLE/VertexAttribute.h

@@ -10,12 +10,11 @@
 #define LIBANGLE_VERTEXATTRIBUTE_H_
 
 #include "libANGLE/Buffer.h"
-#include "libANGLE/export.h"
 
 namespace gl
 {
 
-struct ANGLE_EXPORT VertexAttribute
+struct VertexAttribute
 {
     bool enabled; // From glEnable/DisableVertexAttribArray
 

src/libANGLE/export.h

-//
-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-#ifndef LIBANGLE_EXPORT_H_
-#define LIBANGLE_EXPORT_H_
-
-#include "common/platform.h"
-
-#if defined(LIBANGLE_STATIC)
-#   define ANGLE_EXPORT
-#else
-#   if defined(_WIN32)
-#       if defined(LIBANGLE_IMPLEMENTATION)
-#           define ANGLE_EXPORT __declspec(dllexport)
-#      else
-#         define ANGLE_EXPORT __declspec(dllimport)
-#      endif
-#   elif defined(__GNUC__)
-#       if defined(LIBANGLE_IMPLEMENTATION)
-#           define ANGLE_EXPORT __attribute__((visibility ("default")))
-#       else
-#           define ANGLE_EXPORT
-#       endif
-#   else
-#       define ANGLE_EXPORT
-#   endif
-#endif
-
-#endif // LIBANGLE_EXPORT_H_

src/libANGLE/formatutils.h

@@ -11,7 +11,6 @@
 
 #include "libANGLE/Caps.h"
 #include "libANGLE/angletypes.h"
-#include "libANGLE/export.h"
 
 #include "angle_gl.h"
 
@@ -38,25 +37,25 @@ typedef void (*VertexCopyFunction)(const uint8_t *input, size_t stride, size_t c
 namespace gl
 {
 
-struct ANGLE_EXPORT FormatType
+struct FormatType
 {
     FormatType();
 
     GLenum internalFormat;
     ColorWriteFunction colorWriteFunction;
 };
-ANGLE_EXPORT const FormatType &GetFormatTypeInfo(GLenum format, GLenum type);
+const FormatType &GetFormatTypeInfo(GLenum format, GLenum type);
 
-struct ANGLE_EXPORT Type
+struct Type
 {
     Type();
 
     GLuint bytes;
     bool specialInterpretation;
 };
-ANGLE_EXPORT const Type &GetTypeInfo(GLenum type);
+const Type &GetTypeInfo(GLenum type);
 
-struct ANGLE_EXPORT InternalFormat
+struct InternalFormat
 {
     InternalFormat();
 
@@ -95,9 +94,9 @@ struct ANGLE_EXPORT InternalFormat
     GLuint computeDepthPitch(GLenum type, GLsizei width, GLsizei height, GLint alignment) const;
     GLuint computeBlockSize(GLenum type, GLsizei width, GLsizei height) const;
 };
-ANGLE_EXPORT const InternalFormat &GetInternalFormatInfo(GLenum internalFormat);
+const InternalFormat &GetInternalFormatInfo(GLenum internalFormat);
 
-ANGLE_EXPORT GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type);
+GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type);
 
 typedef std::set<GLenum> FormatSet;
 const FormatSet &GetAllSizedInternalFormats();

src/libANGLE/queryconversions.cpp

@@ -138,10 +138,10 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
 // The calls below will make CastStateValues successfully link with the GL state query types
 // The GL state query API types are: bool, int, uint, float, int64
 
-template ANGLE_EXPORT void CastStateValues<GLboolean>(Context *, GLenum, GLenum, unsigned int, GLboolean *);
-template ANGLE_EXPORT void CastStateValues<GLint>(Context *, GLenum, GLenum, unsigned int, GLint *);
-template ANGLE_EXPORT void CastStateValues<GLuint>(Context *, GLenum, GLenum, unsigned int, GLuint *);
-template ANGLE_EXPORT void CastStateValues<GLfloat>(Context *, GLenum, GLenum, unsigned int, GLfloat *);
-template ANGLE_EXPORT void CastStateValues<GLint64>(Context *, GLenum, GLenum, unsigned int, GLint64 *);
+template void CastStateValues<GLboolean>(Context *, GLenum, GLenum, unsigned int, GLboolean *);
+template void CastStateValues<GLint>(Context *, GLenum, GLenum, unsigned int, GLint *);
+template void CastStateValues<GLuint>(Context *, GLenum, GLenum, unsigned int, GLuint *);
+template void CastStateValues<GLfloat>(Context *, GLenum, GLenum, unsigned int, GLfloat *);
+template void CastStateValues<GLint64>(Context *, GLenum, GLenum, unsigned int, GLint64 *);
 
 }

src/libANGLE/queryconversions.h

@@ -6,7 +6,6 @@
 
 // queryconversions.h: Declaration of state query cast conversions
 
-#include "libANGLE/export.h"
 
 namespace gl
 {

src/libANGLE/renderer/SurfaceImpl.h

@@ -11,7 +11,6 @@
 
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
-#include "libANGLE/export.h"
 
 namespace egl
 {
@@ -27,8 +26,7 @@ class Texture2D;
 namespace rx
 {
 
-// TODO: don't export this class, make it a pure interface if possible
-class ANGLE_EXPORT SurfaceImpl
+class SurfaceImpl
 {
   public:
     SurfaceImpl(egl::Display *display, const egl::Config *config, EGLint width, EGLint height,

src/libANGLE/renderer/d3d/d3d11/NativeWindow.h

@@ -12,8 +12,6 @@
 #ifndef LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
 #define LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
 
-#include "libANGLE/export.h"
-
 #include "common/debug.h"
 #include "common/platform.h"
 
@@ -72,8 +70,7 @@ class NativeWindow
 
 };
 
-// TODO: don't export this function.
-ANGLE_EXPORT bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
+bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
 }
 
 #endif // LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_

src/libANGLE/validationES.h

@@ -9,8 +9,6 @@
 #ifndef LIBANGLE_VALIDATION_ES_H_
 #define LIBANGLE_VALIDATION_ES_H_
 
-#include "libANGLE/export.h"
-
 #include "common/mathutil.h"
 
 #include <GLES2/gl2.h>
@@ -21,75 +19,75 @@ namespace gl
 
 class Context;
 
-ANGLE_EXPORT bool ValidCap(const Context *context, GLenum cap);
-ANGLE_EXPORT bool ValidTextureTarget(const Context *context, GLenum target);
-ANGLE_EXPORT bool ValidTexture2DDestinationTarget(const Context *context, GLenum target);
-ANGLE_EXPORT bool ValidFramebufferTarget(GLenum target);
-ANGLE_EXPORT bool ValidBufferTarget(const Context *context, GLenum target);
-ANGLE_EXPORT bool ValidBufferParameter(const Context *context, GLenum pname);
-ANGLE_EXPORT bool ValidMipLevel(const Context *context, GLenum target, GLint level);
-ANGLE_EXPORT bool ValidImageSize(const Context *context, GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth);
-ANGLE_EXPORT bool ValidCompressedImageSize(const Context *context, GLenum internalFormat, GLsizei width, GLsizei height);
-ANGLE_EXPORT bool ValidQueryType(const Context *context, GLenum queryType);
-ANGLE_EXPORT bool ValidProgram(Context *context, GLuint id);
+bool ValidCap(const Context *context, GLenum cap);
+bool ValidTextureTarget(const Context *context, GLenum target);
+bool ValidTexture2DDestinationTarget(const Context *context, GLenum target);
+bool ValidFramebufferTarget(GLenum target);
+bool ValidBufferTarget(const Context *context, GLenum target);
+bool ValidBufferParameter(const Context *context, GLenum pname);
+bool ValidMipLevel(const Context *context, GLenum target, GLint level);
+bool ValidImageSize(const Context *context, GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth);
+bool ValidCompressedImageSize(const Context *context, GLenum internalFormat, GLsizei width, GLsizei height);
+bool ValidQueryType(const Context *context, GLenum queryType);
+bool ValidProgram(Context *context, GLuint id);
 
-ANGLE_EXPORT bool ValidateAttachmentTarget(Context *context, GLenum attachment);
-ANGLE_EXPORT bool ValidateRenderbufferStorageParametersBase(Context *context, GLenum target, GLsizei samples,
-                                                            GLenum internalformat, GLsizei width, GLsizei height);
-ANGLE_EXPORT bool ValidateRenderbufferStorageParametersANGLE(Context *context, GLenum target, GLsizei samples,
-                                                             GLenum internalformat, GLsizei width, GLsizei height);
+bool ValidateAttachmentTarget(Context *context, GLenum attachment);
+bool ValidateRenderbufferStorageParametersBase(Context *context, GLenum target, GLsizei samples,
+                                               GLenum internalformat, GLsizei width, GLsizei height);
+bool ValidateRenderbufferStorageParametersANGLE(Context *context, GLenum target, GLsizei samples,
+                                                GLenum internalformat, GLsizei width, GLsizei height);
 
-ANGLE_EXPORT bool ValidateFramebufferRenderbufferParameters(Context *context, GLenum target, GLenum attachment,
-                                                            GLenum renderbuffertarget, GLuint renderbuffer);
+bool ValidateFramebufferRenderbufferParameters(Context *context, GLenum target, GLenum attachment,
+                                               GLenum renderbuffertarget, GLuint renderbuffer);
 
-ANGLE_EXPORT bool ValidateBlitFramebufferParameters(Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                                                    GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
-                                                    GLenum filter, bool fromAngleExtension);
+bool ValidateBlitFramebufferParameters(Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                                       GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
+                                       GLenum filter, bool fromAngleExtension);
 
-ANGLE_EXPORT bool ValidateGetVertexAttribParameters(Context *context, GLenum pname);
+bool ValidateGetVertexAttribParameters(Context *context, GLenum pname);
 
-ANGLE_EXPORT bool ValidateTexParamParameters(Context *context, GLenum pname, GLint param);
+bool ValidateTexParamParameters(Context *context, GLenum pname, GLint param);
 
-ANGLE_EXPORT bool ValidateSamplerObjectParameter(Context *context, GLenum pname);
+bool ValidateSamplerObjectParameter(Context *context, GLenum pname);
 
-ANGLE_EXPORT bool ValidateReadPixelsParameters(Context *context, GLint x, GLint y, GLsizei width, GLsizei height,
+bool ValidateReadPixelsParameters(Context *context, GLint x, GLint y, GLsizei width, GLsizei height,
                                                GLenum format, GLenum type, GLsizei *bufSize, GLvoid *pixels);
 
-ANGLE_EXPORT bool ValidateBeginQuery(Context *context, GLenum target, GLuint id);
-ANGLE_EXPORT bool ValidateEndQuery(Context *context, GLenum target);
+bool ValidateBeginQuery(Context *context, GLenum target, GLuint id);
+bool ValidateEndQuery(Context *context, GLenum target);
 
-ANGLE_EXPORT bool ValidateUniform(Context *context, GLenum uniformType, GLint location, GLsizei count);
-ANGLE_EXPORT bool ValidateUniformMatrix(Context *context, GLenum matrixType, GLint location, GLsizei count,
-                                        GLboolean transpose);
+bool ValidateUniform(Context *context, GLenum uniformType, GLint location, GLsizei count);
+bool ValidateUniformMatrix(Context *context, GLenum matrixType, GLint location, GLsizei count,
+                           GLboolean transpose);
 
-ANGLE_EXPORT bool ValidateStateQuery(Context *context, GLenum pname, GLenum *nativeType, unsigned int *numParams);
+bool ValidateStateQuery(Context *context, GLenum pname, GLenum *nativeType, unsigned int *numParams);
 
-ANGLE_EXPORT bool ValidateCopyTexImageParametersBase(Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
+bool ValidateCopyTexImageParametersBase(Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
                                                      GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height,
                                                      GLint border, GLenum *textureInternalFormatOut);
 
-ANGLE_EXPORT bool ValidateDrawArrays(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-ANGLE_EXPORT bool ValidateDrawArraysInstanced(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-ANGLE_EXPORT bool ValidateDrawArraysInstancedANGLE(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+bool ValidateDrawArrays(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+bool ValidateDrawArraysInstanced(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+bool ValidateDrawArraysInstancedANGLE(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
 
-ANGLE_EXPORT bool ValidateDrawElements(Context *context, GLenum mode, GLsizei count, GLenum type,
-                                       const GLvoid* indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
+bool ValidateDrawElements(Context *context, GLenum mode, GLsizei count, GLenum type,
+                          const GLvoid* indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
 
-ANGLE_EXPORT bool ValidateDrawElementsInstanced(Context *context, GLenum mode, GLsizei count, GLenum type,
-                                                const GLvoid *indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
-ANGLE_EXPORT bool ValidateDrawElementsInstancedANGLE(Context *context, GLenum mode, GLsizei count, GLenum type,
-                                                     const GLvoid *indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
+bool ValidateDrawElementsInstanced(Context *context, GLenum mode, GLsizei count, GLenum type,
+                                   const GLvoid *indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
+bool ValidateDrawElementsInstancedANGLE(Context *context, GLenum mode, GLsizei count, GLenum type,
+                                        const GLvoid *indices, GLsizei primcount, rx::RangeUI *indexRangeOut);
 
-ANGLE_EXPORT bool ValidateFramebufferTextureBase(Context *context, GLenum target, GLenum attachment,
-                                                 GLuint texture, GLint level);
-ANGLE_EXPORT bool ValidateFramebufferTexture2D(Context *context, GLenum target, GLenum attachment,
-                                               GLenum textarget, GLuint texture, GLint level);
+bool ValidateFramebufferTextureBase(Context *context, GLenum target, GLenum attachment,
+                                    GLuint texture, GLint level);
+bool ValidateFramebufferTexture2D(Context *context, GLenum target, GLenum attachment,
+                                   GLenum textarget, GLuint texture, GLint level);
 
-ANGLE_EXPORT bool ValidateGetUniformBase(Context *context, GLuint program, GLint location);
-ANGLE_EXPORT bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat* params);
-ANGLE_EXPORT bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint* params);
-ANGLE_EXPORT bool ValidateGetnUniformfvEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLfloat* params);
-ANGLE_EXPORT bool ValidateGetnUniformivEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLint* params);
+bool ValidateGetUniformBase(Context *context, GLuint program, GLint location);
+bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat* params);
+bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint* params);
+bool ValidateGetnUniformfvEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLfloat* params);
+bool ValidateGetnUniformivEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLint* params);
 
 }
 

src/libANGLE/validationES2.h

@@ -9,8 +9,6 @@
 #ifndef LIBANGLE_VALIDATION_ES2_H_
 #define LIBANGLE_VALIDATION_ES2_H_
 
-#include "libANGLE/export.h"
-
 #include <GLES2/gl2.h>
 
 namespace gl
@@ -18,18 +16,18 @@ namespace gl
 
 class Context;
 
-ANGLE_EXPORT bool ValidateES2TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage,
-                                                GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
-                                                GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+bool ValidateES2TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage,
+                                   GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
+                                   GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
-ANGLE_EXPORT bool ValidateES2CopyTexImageParameters(Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
-                                                    GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height,
-                                                    GLint border);
+bool ValidateES2CopyTexImageParameters(Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
+                                       GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height,
+                                       GLint border);
 
-ANGLE_EXPORT bool ValidateES2TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat,
+bool ValidateES2TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat,
                                                    GLsizei width, GLsizei height);
 
-ANGLE_EXPORT bool ValidES2ReadFormatType(Context *context, GLenum format, GLenum type);
+bool ValidES2ReadFormatType(Context *context, GLenum format, GLenum type);
 
 }
 

src/libANGLE/validationES3.h

@@ -9,8 +9,6 @@
 #ifndef LIBANGLE_VALIDATION_ES3_H_
 #define LIBANGLE_VALIDATION_ES3_H_
 
-#include "libANGLE/export.h"
-
 #include <GLES3/gl3.h>
 
 namespace gl
@@ -18,31 +16,31 @@ namespace gl
 
 class Context;
 
-ANGLE_EXPORT bool ValidateES3TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage,
-                                                GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
-                                                GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+bool ValidateES3TexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat, bool isCompressed, bool isSubImage,
+                                   GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
+                                   GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
-ANGLE_EXPORT bool ValidateES3CopyTexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat,
-                                                    bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y,
-                                                    GLsizei width, GLsizei height, GLint border);
+bool ValidateES3CopyTexImageParameters(Context *context, GLenum target, GLint level, GLenum internalformat,
+                                       bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y,
+                                       GLsizei width, GLsizei height, GLint border);
 
-ANGLE_EXPORT bool ValidateES3TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat,
-                                                  GLsizei width, GLsizei height, GLsizei depth);
+bool ValidateES3TexStorageParameters(Context *context, GLenum target, GLsizei levels, GLenum internalformat,
+                                     GLsizei width, GLsizei height, GLsizei depth);
 
-ANGLE_EXPORT bool ValidateFramebufferTextureLayer(Context *context, GLenum target, GLenum attachment,
-                                                  GLuint texture, GLint level, GLint layer);
+bool ValidateFramebufferTextureLayer(Context *context, GLenum target, GLenum attachment,
+                                     GLuint texture, GLint level, GLint layer);
 
-ANGLE_EXPORT bool ValidES3ReadFormatType(Context *context, GLenum internalFormat, GLenum format, GLenum type);
+bool ValidES3ReadFormatType(Context *context, GLenum internalFormat, GLenum format, GLenum type);
 
-ANGLE_EXPORT bool ValidateES3RenderbufferStorageParameters(Context *context, GLenum target, GLsizei samples,
-                                                           GLenum internalformat, GLsizei width, GLsizei height);
+bool ValidateES3RenderbufferStorageParameters(Context *context, GLenum target, GLsizei samples,
+                                              GLenum internalformat, GLsizei width, GLsizei height);
 
-ANGLE_EXPORT bool ValidateInvalidateFramebufferParameters(Context *context, GLenum target, GLsizei numAttachments,
+bool ValidateInvalidateFramebufferParameters(Context *context, GLenum target, GLsizei numAttachments,
                                              const GLenum* attachments);
 
-ANGLE_EXPORT bool ValidateClearBuffer(Context *context);
+bool ValidateClearBuffer(Context *context);
 
-ANGLE_EXPORT bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint* params);
+bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint* params);
 
 }
 

src/libGLESv2.gypi

@@ -102,7 +102,6 @@
             'libANGLE/VertexAttribute.h',
             'libANGLE/angletypes.cpp',
             'libANGLE/angletypes.h',
-            'libANGLE/export.h',
             'libANGLE/features.h',
             'libANGLE/formatutils.cpp',
             'libANGLE/formatutils.h',
@@ -352,7 +351,6 @@
             'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp',
             'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h',
         ],
-        'libangle_static%': 1,
     },
     # Everything below this is duplicated in the GN build. If you change
     # anything also change angle/BUILD.gn
@@ -360,6 +358,7 @@
     [
         {
             'target_name': 'libANGLE',
+            'type': 'static_library',
             'dependencies': [ 'translator', 'commit_id', ],
             'includes': [ '../build/common_defines.gypi', ],
             'include_dirs':
@@ -415,24 +414,6 @@
             },
             'conditions':
             [
-                ['libangle_static==1',
-                {
-                    'defines':
-                    [
-                        'LIBANGLE_STATIC',
-                    ],
-                    'direct_dependent_settings':
-                    {
-                        'defines':
-                        [
-                            'LIBANGLE_STATIC',
-                        ],
-                    },
-                    'type': 'static_library',
-                },
-                { # 'libangle_static==0'
-                    'type': 'shared_library',
-                }],
                 ['angle_enable_d3d9==1 or angle_enable_d3d11==1',
                 {
                     'sources':