Clean up GL header includes.

Change-Id: I6dcaac900eaae54d2ec0265d656fdc9c38371b8a
Reviewed-on: https://swiftshader-review.googlesource.com/4449
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/common/Image.cpp b/src/OpenGL/common/Image.cpp
index 9799f98..748c262 100644 (file)
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -17,7 +17,6 @@
 #include "Common/Math.hpp"
 #include "Common/Thread.hpp"
 
-#include <GLES/glext.h>
 #include <GLES2/gl2ext.h>
 #include <GLES3/gl3.h>
 

diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index e2402ac..abd2d5f 100644 (file)
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -4,7 +4,6 @@
 #include "libEGL/Texture.hpp"\r
 #include "Renderer/Surface.hpp"\r
 \r
-#include <GLES/gl.h>\r
 #include <GLES2/gl2.h>\r
 \r
 #if defined(__ANDROID__)\r
@@ -26,11 +25,6 @@
 \r
 namespace egl\r
 {\r
-// Types common between gl.h and gl2.h\r
-// We can't include either header in EGL\r
-typedef unsigned int GLenum;\r
-typedef int GLint;\r
-typedef int GLsizei;\r
 \r
 sw::Format SelectInternalFormat(GLenum format, GLenum type);\r
 GLsizei ComputePitch(GLsizei width, GLenum format, GLenum type, GLint alignment);\r

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index b5364b9..cd8875b 100644 (file)
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -341,7 +341,7 @@ void BindBuffer(GLenum target, GLuint buffer)
 \r
        if(context)\r
        {\r
-               egl::GLint clientVersion = egl::getClientVersion();\r
+               GLint clientVersion = egl::getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -460,7 +460,7 @@ void BindTexture(GLenum target, GLuint texture)
                        return error(GL_INVALID_OPERATION);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -553,7 +553,7 @@ void BlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dst
        TRACE("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",\r
              srcRGB, dstRGB, srcAlpha, dstAlpha);\r
 \r
-       egl::GLint clientVersion = egl::getClientVersion();\r
+       GLint clientVersion = egl::getClientVersion();\r
 \r
        switch(srcRGB)\r
        {\r
@@ -673,7 +673,7 @@ void BufferData(GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage
                return error(GL_INVALID_VALUE);\r
        }\r
 \r
-       egl::GLint clientVersion = egl::getClientVersion();\r
+       GLint clientVersion = egl::getClientVersion();\r
 \r
        switch(usage)\r
        {\r
@@ -2082,7 +2082,7 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
                        }\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(attachment)\r
                {\r
@@ -2233,7 +2233,7 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
                        return error(GL_INVALID_OPERATION);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(attachment)\r
                {\r
@@ -2340,7 +2340,7 @@ void GenerateMipmap(GLenum target)
        {\r
                es2::Texture *texture = nullptr;\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -2694,7 +2694,7 @@ void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
                        return error(GL_INVALID_OPERATION);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(pname)\r
                {\r
@@ -2838,7 +2838,7 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
                        return error(GL_INVALID_ENUM);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                es2::Framebuffer *framebuffer = NULL;\r
                if(target == GL_READ_FRAMEBUFFER_ANGLE)\r
@@ -3257,7 +3257,7 @@ void GetProgramiv(GLuint program, GLenum pname, GLint* params)
                        return error(GL_INVALID_VALUE);\r
                }\r
 \r
-               egl::GLint clientVersion = egl::getClientVersion();\r
+               GLint clientVersion = egl::getClientVersion();\r
 \r
                switch(pname)\r
                {\r
@@ -3638,7 +3638,7 @@ void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
        {\r
                es2::Texture *texture;\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -3784,7 +3784,7 @@ void GetTexParameteriv(GLenum target, GLenum pname, GLint* params)
        {\r
                es2::Texture *texture;\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -4103,7 +4103,7 @@ void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
 \r
                const es2::VertexAttribute &attribState = context->getVertexAttribState(index);\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(pname)\r
                {\r
@@ -4176,7 +4176,7 @@ void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
 \r
                const es2::VertexAttribute &attribState = context->getVertexAttribState(index);\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(pname)\r
                {\r
@@ -4312,7 +4312,7 @@ GLboolean IsEnabled(GLenum cap)
 \r
        if(context)\r
        {\r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(cap)\r
                {\r
@@ -4536,7 +4536,7 @@ void PixelStorei(GLenum pname, GLint param)
 \r
        if(context)\r
        {\r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(pname)\r
                {\r
@@ -4740,7 +4740,7 @@ void RenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samples, GLenum
                        return error(GL_INVALID_OPERATION);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
                switch(internalformat)\r
                {\r
                case GL_DEPTH_COMPONENT32F:\r
@@ -5118,7 +5118,7 @@ void TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width,
 \r
        if(context)\r
        {\r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
                if(clientVersion < 3)\r
                {\r
                        if(internalformat != format)\r
@@ -5884,7 +5884,7 @@ void TexParameterf(GLenum target, GLenum pname, GLfloat param)
        {\r
                es2::Texture *texture;\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -6039,7 +6039,7 @@ void TexParameteri(GLenum target, GLenum pname, GLint param)
        {\r
                es2::Texture *texture;\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(target)\r
                {\r
@@ -6900,7 +6900,7 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal
                return error(GL_INVALID_VALUE);\r
        }\r
 \r
-       egl::GLint clientVersion = egl::getClientVersion();\r
+       GLint clientVersion = egl::getClientVersion();\r
 \r
        switch(type)\r
        {\r
@@ -7352,7 +7352,7 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
                        return error(GL_INVALID_OPERATION);\r
                }\r
 \r
-               egl::GLint clientVersion = context->getClientVersion();\r
+               GLint clientVersion = context->getClientVersion();\r
 \r
                switch(attachment)\r
                {\r

diff --git a/src/OpenGL/libGLESv2/utilities.cpp b/src/OpenGL/libGLESv2/utilities.cpp
index 68a0950..15180eb 100644 (file)
--- a/src/OpenGL/libGLESv2/utilities.cpp
+++ b/src/OpenGL/libGLESv2/utilities.cpp
@@ -465,59 +465,59 @@ namespace es2
                return static_cast<GLint>((static_cast<GLfloat>(0xFFFFFFFF) * value - 1.0f) * 0.5f);\r
        }\r
 \r
-       bool IsCompressed(GLenum format, egl::GLint clientVersion)\r
+       bool IsCompressed(GLenum format, GLint clientVersion)\r
        {\r
                return ValidateCompressedFormat(format, clientVersion, true) == GL_NONE;\r
        }\r
 \r
-       GLenum ValidateCompressedFormat(GLenum format, egl::GLint clientVersion, bool expectCompressedFormats)\r
+       GLenum ValidateCompressedFormat(GLenum format, GLint clientVersion, bool expectCompressedFormats)\r
        {\r
                switch(format)\r
                {\r
-               case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-               case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-               case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
-               case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
-                       return S3TC_SUPPORT ? (expectCompressedFormats ? GL_NONE : GL_INVALID_OPERATION) : GL_INVALID_ENUM;
-               case GL_ETC1_RGB8_OES:
-                       return expectCompressedFormats ? GL_NONE : GL_INVALID_OPERATION;
-               case GL_COMPRESSED_R11_EAC:
-               case GL_COMPRESSED_SIGNED_R11_EAC:
-               case GL_COMPRESSED_RG11_EAC:
-               case GL_COMPRESSED_SIGNED_RG11_EAC:
-               case GL_COMPRESSED_RGB8_ETC2:
-               case GL_COMPRESSED_SRGB8_ETC2:
-               case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-               case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-               case GL_COMPRESSED_RGBA8_ETC2_EAC:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
-               case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+               case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:\r
+               case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:\r
+               case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:\r
+               case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:\r
+                       return S3TC_SUPPORT ? (expectCompressedFormats ? GL_NONE : GL_INVALID_OPERATION) : GL_INVALID_ENUM;\r
+               case GL_ETC1_RGB8_OES:\r
+                       return expectCompressedFormats ? GL_NONE : GL_INVALID_OPERATION;\r
+               case GL_COMPRESSED_R11_EAC:\r
+               case GL_COMPRESSED_SIGNED_R11_EAC:\r
+               case GL_COMPRESSED_RG11_EAC:\r
+               case GL_COMPRESSED_SIGNED_RG11_EAC:\r
+               case GL_COMPRESSED_RGB8_ETC2:\r
+               case GL_COMPRESSED_SRGB8_ETC2:\r
+               case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:\r
+               case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:\r
+               case GL_COMPRESSED_RGBA8_ETC2_EAC:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:\r
+               case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:\r
+               case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:\r
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:\r
                case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:\r
                        return (clientVersion >= 3) ? (expectCompressedFormats ? GL_NONE : GL_INVALID_OPERATION) : GL_INVALID_ENUM;\r
                default:\r
@@ -597,7 +597,7 @@ namespace es2
                return GL_NONE;\r
        }\r
 \r
-       bool ValidReadPixelsFormatType(GLenum internalFormat, GLenum internalType, GLenum format, GLenum type, egl::GLint clientVersion)\r
+       bool ValidReadPixelsFormatType(GLenum internalFormat, GLenum internalType, GLenum format, GLenum type, GLint clientVersion)\r
        {\r
                switch(format)\r
                {\r
@@ -703,7 +703,7 @@ namespace es2
        }\r
 \r
        // Verify that format/type are one of the combinations from table 3.4.\r
-       bool CheckTextureFormatType(GLenum format, GLenum type, egl::GLint clientVersion)\r
+       bool CheckTextureFormatType(GLenum format, GLenum type, GLint clientVersion)\r
        {\r
                switch(type)\r
                {\r
@@ -823,7 +823,7 @@ namespace es2
                }\r
        }\r
 \r
-       bool IsColorRenderable(GLenum internalformat, egl::GLint clientVersion)\r
+       bool IsColorRenderable(GLenum internalformat, GLint clientVersion)\r
        {\r
                switch(internalformat)\r
                {\r

diff --git a/src/OpenGL/libGLESv2/utilities.h b/src/OpenGL/libGLESv2/utilities.h
index 01b75a6..c7ff12a 100644 (file)
--- a/src/OpenGL/libGLESv2/utilities.h
+++ b/src/OpenGL/libGLESv2/utilities.h
@@ -40,20 +40,20 @@ namespace es2
 \r
        GLint floatToInt(GLfloat value);\r
 \r
-       bool IsCompressed(GLenum format, egl::GLint clientVersion);\r
+       bool IsCompressed(GLenum format, GLint clientVersion);\r
        GLenum GetSizedInternalFormat(GLenum internalFormat, GLenum type);\r
-       GLenum ValidateCompressedFormat(GLenum format, egl::GLint clientVersion, bool expectCompressedFormats);\r
+       GLenum ValidateCompressedFormat(GLenum format, GLint clientVersion, bool expectCompressedFormats);\r
        GLenum ValidateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLenum target, GLint level, GLenum sizedInternalFormat, Texture *texture);\r
        GLenum ValidateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLsizei depth, GLint xoffset, GLint yoffset, GLint zoffset, GLenum target, GLint level, GLenum sizedInternalFormat, Texture *texture);\r
-       bool ValidReadPixelsFormatType(GLenum internalFormat, GLenum internalType, GLenum format, GLenum type, egl::GLint clientVersion);\r
+       bool ValidReadPixelsFormatType(GLenum internalFormat, GLenum internalType, GLenum format, GLenum type, GLint clientVersion);\r
        bool IsDepthTexture(GLenum format);\r
        bool IsStencilTexture(GLenum format);\r
        bool IsCubemapTextureTarget(GLenum target);\r
        int CubeFaceIndex(GLenum cubeTarget);\r
        bool IsTextureTarget(GLenum target);\r
-       bool CheckTextureFormatType(GLenum format, GLenum type, egl::GLint clientVersion);\r
+       bool CheckTextureFormatType(GLenum format, GLenum type, GLint clientVersion);\r
 \r
-       bool IsColorRenderable(GLenum internalformat, egl::GLint clientVersion);\r
+       bool IsColorRenderable(GLenum internalformat, GLint clientVersion);\r
        bool IsDepthRenderable(GLenum internalformat);\r
        bool IsStencilRenderable(GLenum internalformat);\r
 \r