Revert "Encapsulate GL version and standard into a struct and enum."

src/libANGLE/Version.h

-//
-// Copyright (c) 2015 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.
-//
-
-// Version.h: Encapsulation of a GL version.
-
-#ifndef LIBANGLE_VERSION_H_
-#define LIBANGLE_VERSION_H_
-
-#include <angle_gl.h>
-
-namespace gl
-{
-
-struct Version
-{
-    Version();
-    Version(GLuint major, GLuint minor);
-
-    GLuint major;
-    GLuint minor;
-};
-
-bool operator>=(const Version &a, const Version &b);
-
-}
-
-#include "Version.inl"
-
-#endif // LIBANGLE_VERSION_H_

src/libANGLE/Version.inl

-//
-// Copyright (c) 2015 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.
-//
-
-// Version.inl: Encapsulation of a GL version.
-
-namespace gl
-{
-
-inline Version::Version()
-    : Version(0, 0)
-{
-}
-
-inline Version::Version(GLuint major, GLuint minor)
-    : major(major),
-      minor(minor)
-{
-}
-
-inline bool operator>=(const Version &a, const Version &b)
-{
-    return a.major > b.major || (a.major == b.major && a.minor >= b.minor);
-}
-
-}

src/libANGLE/renderer/gl/FunctionsGL.cpp

@@ -16,7 +16,8 @@
 namespace rx
 {
 
-static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, gl::Version *outVersion, StandardGL *outStandard)
+static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, GLuint *outMajorVersion, GLuint *outMinorVersion,
+                         bool *outIsES)
 {
     const std::string version = reinterpret_cast<const char*>(getStringFunction(GL_VERSION));
     if (version.find("OpenGL ES") == std::string::npos)
@@ -26,15 +27,17 @@ static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, gl::Version *outV
         // The version number is either of the form major number.minor number or major
         // number.minor number.release number, where the numbers all have one or more
         // digits
-        *outStandard = STANDARD_GL_DESKTOP;
-        *outVersion = gl::Version(version[0] - '0', version[2] - '0');
+        *outIsES = false;
+        *outMajorVersion = version[0] - '0';
+        *outMinorVersion = version[2] - '0';
     }
     else
     {
         // ES spec states that the GL_VERSION string will be in the following format:
         // "OpenGL ES N.M vendor-specific information"
-        *outStandard = STANDARD_GL_ES;
-        *outVersion = gl::Version(version[10] - '0', version[12] - '0');
+        *outIsES = true;
+        *outMajorVersion = version[10] - '0';
+        *outMinorVersion = version[12] - '0';
     }
 }
 
@@ -80,8 +83,9 @@ static void AssignGLExtensionEntryPoint(const std::vector<std::string> &extensio
 }
 
 FunctionsGL::FunctionsGL()
-    : version(),
-      standard(),
+    : majorVersion(0),
+      minorVersion(0),
+      openGLES(false),
       extensions(),
 
       blendFunc(nullptr),
@@ -773,10 +777,10 @@ void FunctionsGL::initialize()
 {
     // Grab the version number
     AssignGLEntryPoint(loadProcAddress("glGetString"), &getString);
-    GetGLVersion(getString, &version, &standard);
+    GetGLVersion(getString, &majorVersion, &minorVersion, &openGLES);
 
     // Grab the GL extensions
-    if (isAtLeastGL(gl::Version(3, 0)))
+    if (majorVersion >= 3)
     {
         AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
         AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
@@ -789,7 +793,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.0
-    if (isAtLeastGL(gl::Version(1, 0)))
+    if (majorVersion >= 1)
     {
         AssignGLEntryPoint(loadProcAddress("glBlendFunc"), &blendFunc);
         AssignGLEntryPoint(loadProcAddress("glClear"), &clear);
@@ -842,7 +846,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.1
-    if (isAtLeastGL(gl::Version(1, 1)))
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glBindTexture"), &bindTexture);
         AssignGLEntryPoint(loadProcAddress("glCopyTexImage1D"), &copyTexImage1D);
@@ -875,7 +879,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.2
-    if (isAtLeastGL(gl::Version(1, 2)))
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glBlendColor"), &blendColor);
         AssignGLEntryPoint(loadProcAddress("glBlendEquation"), &blendEquation);
@@ -902,7 +906,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.3
-    if (isAtLeastGL(gl::Version(1, 3)))
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glActiveTexture"), &activeTexture);
         AssignGLEntryPoint(loadProcAddress("glCompressedTexImage1D"), &compressedTexImage1D);
@@ -916,7 +920,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.4
-    if (isAtLeastGL(gl::Version(1, 4)))
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 4))
     {
         AssignGLEntryPoint(loadProcAddress("glBlendFuncSeparate"), &blendFuncSeparate);
         AssignGLEntryPoint(loadProcAddress("glMultiDrawArrays"), &multiDrawArrays);
@@ -928,7 +932,7 @@ void FunctionsGL::initialize()
     }
 
     // 1.5
-    if (isAtLeastGL(gl::Version(1, 5)))
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 5))
     {
         AssignGLEntryPoint(loadProcAddress("glBeginQuery"), &beginQuery);
         AssignGLEntryPoint(loadProcAddress("glBindBuffer"), &bindBuffer);
@@ -952,7 +956,7 @@ void FunctionsGL::initialize()
     }
 
     // 2.0
-    if (isAtLeastGL(gl::Version(2, 0)))
+    if (majorVersion >= 2)
     {
         AssignGLEntryPoint(loadProcAddress("glAttachShader"), &attachShader);
         AssignGLEntryPoint(loadProcAddress("glBindAttribLocation"), &bindAttribLocation);
@@ -1050,7 +1054,7 @@ void FunctionsGL::initialize()
     }
 
     // 2.1
-    if (isAtLeastGL(gl::Version(2, 1)))
+    if (majorVersion > 2 || (majorVersion == 2 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x3fv"), &uniformMatrix2x3fv);
         AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x4fv"), &uniformMatrix2x4fv);
@@ -1061,7 +1065,7 @@ void FunctionsGL::initialize()
     }
 
     // 3.0
-    if (isAtLeastGL(gl::Version(3, 0)))
+    if (majorVersion >= 3)
     {
         AssignGLEntryPoint(loadProcAddress("glBeginConditionalRender"), &beginConditionalRender);
         AssignGLEntryPoint(loadProcAddress("glBeginTransformFeedback"), &beginTransformFeedback);
@@ -1153,7 +1157,7 @@ void FunctionsGL::initialize()
     }
 
     // 3.1
-    if (isAtLeastGL(gl::Version(3, 1)))
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glCopyBufferSubData"), &copyBufferSubData);
         AssignGLEntryPoint(loadProcAddress("glDrawArraysInstanced"), &drawArraysInstanced);
@@ -1180,7 +1184,7 @@ void FunctionsGL::initialize()
     }
 
     // 3.2
-    if (isAtLeastGL(gl::Version(3, 2)))
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glClientWaitSync"), &clientWaitSync);
         AssignGLEntryPoint(loadProcAddress("glDeleteSync"), &deleteSync);
@@ -1204,7 +1208,7 @@ void FunctionsGL::initialize()
     }
 
     // 3.3
-    if (isAtLeastGL(gl::Version(3, 3)))
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glBindFragDataLocationIndexed"), &bindFragDataLocationIndexed);
         AssignGLEntryPoint(loadProcAddress("glBindSampler"), &bindSampler);
@@ -1237,7 +1241,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.0
-    if (isAtLeastGL(gl::Version(4, 0)))
+    if (majorVersion >= 4)
     {
         AssignGLEntryPoint(loadProcAddress("glBeginQueryIndexed"), &beginQueryIndexed);
         AssignGLEntryPoint(loadProcAddress("glBindTransformFeedback"), &bindTransformFeedback);
@@ -1288,7 +1292,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.1
-    if (isAtLeastGL(gl::Version(4, 1)))
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glActiveShaderProgram"), &activeShaderProgram);
         AssignGLEntryPoint(loadProcAddress("glBindProgramPipeline"), &bindProgramPipeline);
@@ -1381,7 +1385,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.2
-    if (isAtLeastGL(gl::Version(4, 2)))
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glBindImageTexture"), &bindImageTexture);
         AssignGLEntryPoint(loadProcAddress("glDrawArraysInstancedBaseInstance"), &drawArraysInstancedBaseInstance);
@@ -1398,7 +1402,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.3
-    if (isAtLeastGL(gl::Version(4, 3)))
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glBindVertexBuffer"), &bindVertexBuffer);
         AssignGLEntryPoint(loadProcAddress("glClearBufferData"), &clearBufferData);
@@ -1447,7 +1451,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.4
-    if (isAtLeastGL(gl::Version(4, 4)))
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 4))
     {
         AssignGLEntryPoint(loadProcAddress("glBindBuffersBase"), &bindBuffersBase);
         AssignGLEntryPoint(loadProcAddress("glBindBuffersRange"), &bindBuffersRange);
@@ -1461,7 +1465,7 @@ void FunctionsGL::initialize()
     }
 
     // 4.5
-    if (isAtLeastGL(gl::Version(4, 5)))
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 5))
     {
         AssignGLEntryPoint(loadProcAddress("glBindTextureUnit"), &bindTextureUnit);
         AssignGLEntryPoint(loadProcAddress("glBlitNamedFramebuffer"), &blitNamedFramebuffer);
@@ -1576,16 +1580,6 @@ void FunctionsGL::initialize()
     }
 }
 
-bool FunctionsGL::isAtLeastGL(const gl::Version &glVersion) const
-{
-    return standard == STANDARD_GL_DESKTOP && version >= glVersion;
-}
-
-bool FunctionsGL::isAtLeastGLES(const gl::Version &glesVersion) const
-{
-    return standard == STANDARD_GL_ES && version >= glesVersion;
-}
-
 bool FunctionsGL::hasExtension(const std::string &ext) const
 {
     return std::find(extensions.begin(), extensions.end(), ext) != extensions.end();

src/libANGLE/renderer/gl/FunctionsGL.h

@@ -10,19 +10,12 @@
 #define LIBANGLE_RENDERER_GL_FUNCTIONSGL_H_
 
 #include "common/debug.h"
-#include "libANGLE/Version.h"
 #include "libANGLE/renderer/gl/functionsgl_enums.h"
 #include "libANGLE/renderer/gl/functionsgl_typedefs.h"
 
 namespace rx
 {
 
-enum StandardGL
-{
-    STANDARD_GL_DESKTOP,
-    STANDARD_GL_ES,
-};
-
 class FunctionsGL
 {
   public:
@@ -32,10 +25,9 @@ class FunctionsGL
     void initialize();
 
     // Version information
-    gl::Version version;
-    StandardGL standard;
-    bool isAtLeastGL(const gl::Version &glVersion) const;
-    bool isAtLeastGLES(const gl::Version &glesVersion) const;
+    GLuint majorVersion;
+    GLuint minorVersion;
+    bool openGLES;
 
     // Extensions
     std::vector<std::string> extensions;

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -254,11 +254,11 @@ std::string RendererGL::getRendererDescription() const
 
     std::ostringstream rendererString;
     rendererString << nativeVendorString << " " << nativeRendererString << " OpenGL";
-    if (mFunctions->standard == STANDARD_GL_ES)
+    if (mFunctions->openGLES)
     {
         rendererString << " ES";
     }
-    rendererString << " " << mFunctions->version.major << "." << mFunctions->version.minor;
+    rendererString << " " << mFunctions->majorVersion << "." << mFunctions->minorVersion;
 
     return rendererString.str();
 }

src/libANGLE/renderer/gl/formatutilsgl.cpp

@@ -21,7 +21,8 @@ namespace nativegl
 {
 
 SupportRequirement::SupportRequirement()
-    : version(std::numeric_limits<GLuint>::max(), std::numeric_limits<GLuint>::max()),
+    : majorVersion(std::numeric_limits<GLuint>::max()),
+      minorVersion(std::numeric_limits<GLuint>::max()),
       versionExtensions(),
       requiredExtensions()
 {
@@ -38,8 +39,8 @@ InternalFormat::InternalFormat()
 static inline SupportRequirement VersionOrExts(GLuint major, GLuint minor, const std::string &versionExt)
 {
     SupportRequirement requirement;
-    requirement.version.major = major;
-    requirement.version.minor = minor;
+    requirement.majorVersion = major;
+    requirement.minorVersion = minor;
     angle::SplitStringAlongWhitespace(versionExt, &requirement.versionExtensions);
     return requirement;
 }
@@ -47,8 +48,8 @@ static inline SupportRequirement VersionOrExts(GLuint major, GLuint minor, const
 static inline SupportRequirement VersionAndExts(GLuint major, GLuint minor, const std::string &requiredExt)
 {
     SupportRequirement requirement;
-    requirement.version.major = major;
-    requirement.version.minor = minor;
+    requirement.majorVersion = major;
+    requirement.minorVersion = minor;
     angle::SplitStringAlongWhitespace(requiredExt, &requirement.requiredExtensions);
     return requirement;
 }
@@ -56,8 +57,8 @@ static inline SupportRequirement VersionAndExts(GLuint major, GLuint minor, cons
 static inline SupportRequirement VersionOrExtsAndExts(GLuint major, GLuint minor, const std::string &versionExt,
                                                       const std::string &requiredExt)
 {    SupportRequirement requirement;
-    requirement.version.major = major;
-    requirement.version.minor = minor;
+    requirement.majorVersion = major;
+    requirement.minorVersion = minor;
     angle::SplitStringAlongWhitespace(versionExt, &requirement.versionExtensions);
     angle::SplitStringAlongWhitespace(requiredExt, &requirement.requiredExtensions);
     return requirement;
@@ -66,8 +67,8 @@ static inline SupportRequirement VersionOrExtsAndExts(GLuint major, GLuint minor
 static inline SupportRequirement VersionOnly(GLuint major, GLuint minor)
 {
     SupportRequirement requirement;
-    requirement.version.major = major;
-    requirement.version.minor = minor;
+    requirement.majorVersion = major;
+    requirement.minorVersion = minor;
     return requirement;
 }
 
@@ -81,16 +82,16 @@ static inline SupportRequirement ExtsOnly(const std::string &ext)
 static inline SupportRequirement Always()
 {
     SupportRequirement requirement;
-    requirement.version.major = 0;
-    requirement.version.minor = 0;
+    requirement.majorVersion = 0;
+    requirement.minorVersion = 0;
     return requirement;
 }
 
 static inline SupportRequirement Never()
 {
     SupportRequirement requirement;
-    requirement.version.major = std::numeric_limits<GLuint>::max();
-    requirement.version.minor = std::numeric_limits<GLuint>::max();
+    requirement.majorVersion = std::numeric_limits<GLuint>::max();
+    requirement.minorVersion = std::numeric_limits<GLuint>::max();
     return requirement;
 }
 
@@ -233,23 +234,20 @@ static const InternalFormatInfoMap &GetInternalFormatMap()
     return formatMap;
 }
 
-const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, StandardGL standard)
+const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, bool es)
 {
     const InternalFormatInfoMap &formatMap = GetInternalFormatMap();
     InternalFormatInfoMap::const_iterator iter = formatMap.find(internalFormat);
     if (iter != formatMap.end())
     {
         const InternalFormatInfo &info = iter->second;
-        switch (standard)
-        {
-          case STANDARD_GL_ES:      return info.glesInfo;
-          case STANDARD_GL_DESKTOP: return info.glInfo;
-          default: UNREACHABLE();   break;
-        }
+        return es ? info.glesInfo : info.glInfo;
+    }
+    else
+    {
+        static const InternalFormat defaultInternalFormat;
+        return defaultInternalFormat;
     }
-
-    static const InternalFormat defaultInternalFormat;
-    return defaultInternalFormat;
 }
 
 }

src/libANGLE/renderer/gl/formatutilsgl.h

@@ -14,8 +14,6 @@
 #include <vector>
 
 #include "angle_gl.h"
-#include "libANGLE/Version.h"
-#include "libANGLE/renderer/gl/FunctionsGL.h"
 
 namespace rx
 {
@@ -28,7 +26,8 @@ struct SupportRequirement
     SupportRequirement();
 
     // Version that this format became supported without extensions
-    gl::Version version;
+    GLuint majorVersion;
+    GLuint minorVersion;
 
     // Extensions that are required if the minimum version is not met
     std::vector<std::string> versionExtensions;
@@ -46,7 +45,7 @@ struct InternalFormat
     SupportRequirement renderbuffer;
     SupportRequirement framebufferAttachment;
 };
-const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, StandardGL standard);
+const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, bool es);
 
 }
 

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -35,7 +35,8 @@ static bool MeetsRequirements(const FunctionsGL *functions, const nativegl::Supp
         }
     }
 
-    if (functions->version >= requirements.version)
+    if (functions->majorVersion > requirements.majorVersion ||
+        (functions->majorVersion == requirements.majorVersion && functions->minorVersion >= requirements.minorVersion))
     {
         return true;
     }
@@ -60,7 +61,7 @@ static gl::TextureCaps GenerateTextureFormatCaps(const FunctionsGL *functions, G
 {
     gl::TextureCaps textureCaps;
 
-    const nativegl::InternalFormat &formatInfo = nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
+    const nativegl::InternalFormat &formatInfo = nativegl::GetInternalFormatInfo(internalFormat, functions->openGLES);
     textureCaps.texturable = MeetsRequirements(functions, formatInfo.texture);
     textureCaps.filterable = textureCaps.texturable && MeetsRequirements(functions, formatInfo.filter);
     textureCaps.renderable = MeetsRequirements(functions, formatInfo.framebufferAttachment);

src/libGLESv2.gypi

@@ -109,8 +109,6 @@
             'libANGLE/TransformFeedback.h',
             'libANGLE/Uniform.cpp',
             'libANGLE/Uniform.h',
-            'libANGLE/Version.h',
-            'libANGLE/Version.inl',
             'libANGLE/VertexArray.cpp',
             'libANGLE/VertexArray.h',
             'libANGLE/VertexAttribute.cpp',