Skip to content

A
angle
Commit f51639a4 by Jamie Madill
Options

Use a common include for GL headers.

A common place to define required GL includes gives us a nice point to centralize GL customizations. In the header currently are the basic GLES headers with extensions, and a define carried over from desktop GL. BUG=angle:466 Change-Id: I6fc61947b4514654ec21355a786904eac04656c0 Reviewed-on: https://chromium-review.googlesource.com/204936Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org> Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org>
parent d4a3a317
Showing with 62 additions and 67 deletions
include/angle_gl.h 0 → 100644
//
// 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.
//
// angle_gl.h:
// Includes all necessary GL headers and definitions for ANGLE.
//
#ifndef ANGLE_GL_H_
#define ANGLE_GL_H_
#include "GLES2/gl2.h"
#include "GLES2/gl2ext.h"
#include "GLES3/gl3.h"
#include "GLES3/gl3ext.h"
// The following enum is used in ANGLE, but is from desktop GL
#ifndef GL_SAMPLER_2D_RECT_ARB
#define GL_SAMPLER_2D_RECT_ARB 0x8B63
#endif
#endif // ANGLE_GL_H_
projects/src/libEGL.vcxproj
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
<ClInclude Include="..\..\src\common\angleutils.h"/> <ClInclude Include="..\..\src\common\angleutils.h"/>
<ClInclude Include="..\..\src\common\shadervars.h"/> <ClInclude Include="..\..\src\common\shadervars.h"/>
<ClInclude Include="..\..\src\common\blocklayout.h"/> <ClInclude Include="..\..\src\common\blocklayout.h"/>
<ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLES2\gl2.h"/> <ClInclude Include="..\..\include\GLES2\gl2.h"/>
......
projects/src/libEGL.vcxproj.filters
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
<ClCompile Include="..\..\src\common\blocklayout.cpp"> <ClCompile Include="..\..\src\common\blocklayout.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\include\angle_gl.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\KHR\khrplatform.h"> <ClInclude Include="..\..\include\KHR\khrplatform.h">
<Filter>include\KHR</Filter> <Filter>include\KHR</Filter>
</ClInclude> </ClInclude>
......
projects/src/libGLESv2.vcxproj
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\third_party\systeminfo\SystemInfo.h"/> <ClInclude Include="..\..\src\third_party\systeminfo\SystemInfo.h"/>
<ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/> <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
<ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLES2\gl2ext.h"/> <ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
...@@ -341,11 +342,11 @@ ...@@ -341,11 +342,11 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\VertexBuffer.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\VertexBuffer.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Renderer11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Renderer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\InputLayoutCache.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\InputLayoutCache.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\ShaderExecutable11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\PixelTransfer11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\PixelTransfer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\VertexBuffer11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\VertexBuffer11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Fence11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Fence11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Query11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Query11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\ShaderExecutable11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\RenderTarget11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\RenderTarget11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Blit11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Blit11.cpp"/>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\IndexBuffer11.cpp"/> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\IndexBuffer11.cpp"/>
......
projects/src/libGLESv2.vcxproj.filters
...@@ -366,9 +366,6 @@ ...@@ -366,9 +366,6 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\InputLayoutCache.cpp"> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\InputLayoutCache.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter> <Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\ShaderExecutable11.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\PixelTransfer11.cpp"> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\PixelTransfer11.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter> <Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile> </ClCompile>
...@@ -396,6 +393,9 @@ ...@@ -396,6 +393,9 @@
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Query11.cpp"> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\Query11.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter> <Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\ShaderExecutable11.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\RenderTarget11.cpp"> <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\d3d11\RenderTarget11.cpp">
<Filter>src\libGLESv2\renderer\d3d\d3d11</Filter> <Filter>src\libGLESv2\renderer\d3d\d3d11</Filter>
</ClCompile> </ClCompile>
...@@ -831,6 +831,9 @@ ...@@ -831,6 +831,9 @@
<ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp"> <ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp">
<Filter>src\third_party\murmurhash</Filter> <Filter>src\third_party\murmurhash</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\include\angle_gl.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\KHR\khrplatform.h"> <ClInclude Include="..\..\include\KHR\khrplatform.h">
<Filter>include\KHR</Filter> <Filter>include\KHR</Filter>
</ClInclude> </ClInclude>
......
projects/src/translator_lib.vcxproj
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
<ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraph.h"/> <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraph.h"/>
<ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.h"/> <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.h"/>
<ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.h"/> <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.h"/>
<ClInclude Include="..\..\include\angle_gl.h"/>
<ClInclude Include="..\..\include\KHR\khrplatform.h"/> <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
<ClInclude Include="..\..\include\GLES2\gl2platform.h"/> <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
......
projects/src/translator_lib.vcxproj.filters
...@@ -459,6 +459,9 @@ ...@@ -459,6 +459,9 @@
<ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.cpp"> <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.cpp">
<Filter>src\compiler\translator\depgraph</Filter> <Filter>src\compiler\translator\depgraph</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\include\angle_gl.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\KHR\khrplatform.h"> <ClInclude Include="..\..\include\KHR\khrplatform.h">
<Filter>include\KHR</Filter> <Filter>include\KHR</Filter>
</ClInclude> </ClInclude>
......
src/common/RefCountObject.h
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <cstddef> #include <cstddef>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
......
src/common/blocklayout.h
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
#define COMMON_BLOCKLAYOUT_H_ #define COMMON_BLOCKLAYOUT_H_
#include <vector> #include <vector>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include <GLSLANG/ShaderLang.h> #include <GLSLANG/ShaderLang.h>
#include <cstddef> #include <cstddef>
......
src/common/utilities.h
...@@ -9,11 +9,7 @@ ...@@ -9,11 +9,7 @@
#ifndef LIBGLESV2_UTILITIES_H #ifndef LIBGLESV2_UTILITIES_H
#define LIBGLESV2_UTILITIES_H #define LIBGLESV2_UTILITIES_H
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <string> #include <string>
#include <math.h> #include <math.h>
......
src/compiler/translator/OutputHLSL.h
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
#include <set> #include <set>
#include <map> #include <map>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "compiler/translator/intermediate.h" #include "compiler/translator/intermediate.h"
#include "compiler/translator/ParseContext.h" #include "compiler/translator/ParseContext.h"
#include "common/shadervars.h" #include "common/shadervars.h"
......
src/compiler/translator/UtilsHLSL.h
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <vector> #include <vector>
#include "compiler/translator/Types.h" #include "compiler/translator/Types.h"
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
namespace sh namespace sh
{ {
......
src/compiler/translator/util.h
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#define COMPILER_UTIL_H #define COMPILER_UTIL_H
#include "compiler/translator/Types.h" #include "compiler/translator/Types.h"
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/shadervars.h" #include "common/shadervars.h"
// atof_clamp is like atof but // atof_clamp is like atof but
......
src/libEGL/Config.cpp
...@@ -13,10 +13,7 @@ ...@@ -13,10 +13,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "common/debug.h" #include "common/debug.h"
......
src/libGLESv2/Caps.cpp
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
#include "common/debug.h" #include "common/debug.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include <GLES2/gl2ext.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
......
src/libGLESv2/Caps.h
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include <GLES2/gl2.h> #include "angle_gl.h"
#include <GLES3/gl3.h>
#include <set> #include <set>
#include <unordered_map> #include <unordered_map>
......
src/libGLESv2/Context.h
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
#ifndef LIBGLESV2_CONTEXT_H_ #ifndef LIBGLESV2_CONTEXT_H_
#define LIBGLESV2_CONTEXT_H_ #define LIBGLESV2_CONTEXT_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <string> #include <string>
......
src/libGLESv2/FramebufferAttachment.h
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#ifndef LIBGLESV2_FRAMEBUFFERATTACHMENT_H_ #ifndef LIBGLESV2_FRAMEBUFFERATTACHMENT_H_
#define LIBGLESV2_FRAMEBUFFERATTACHMENT_H_ #define LIBGLESV2_FRAMEBUFFERATTACHMENT_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
......
src/libGLESv2/HandleAllocator.h
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#ifndef LIBGLESV2_HANDLEALLOCATOR_H_ #ifndef LIBGLESV2_HANDLEALLOCATOR_H_
#define LIBGLESV2_HANDLEALLOCATOR_H_ #define LIBGLESV2_HANDLEALLOCATOR_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include <vector> #include <vector>
......
src/libGLESv2/ProgramBinary.h
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
#ifndef LIBGLESV2_PROGRAM_BINARY_H_ #ifndef LIBGLESV2_PROGRAM_BINARY_H_
#define LIBGLESV2_PROGRAM_BINARY_H_ #define LIBGLESV2_PROGRAM_BINARY_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
src/libGLESv2/Query.h
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
#ifndef LIBGLESV2_QUERY_H_ #ifndef LIBGLESV2_QUERY_H_
#define LIBGLESV2_QUERY_H_ #define LIBGLESV2_QUERY_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
......
src/libGLESv2/Renderbuffer.h
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#ifndef LIBGLESV2_RENDERBUFFER_H_ #ifndef LIBGLESV2_RENDERBUFFER_H_
#define LIBGLESV2_RENDERBUFFER_H_ #define LIBGLESV2_RENDERBUFFER_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
......
src/libGLESv2/ResourceManager.h
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#ifndef LIBGLESV2_RESOURCEMANAGER_H_ #ifndef LIBGLESV2_RESOURCEMANAGER_H_
#define LIBGLESV2_RESOURCEMANAGER_H_ #define LIBGLESV2_RESOURCEMANAGER_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include <unordered_map> #include <unordered_map>
......
src/libGLESv2/Shader.h
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
#ifndef LIBGLESV2_SHADER_H_ #ifndef LIBGLESV2_SHADER_H_
#define LIBGLESV2_SHADER_H_ #define LIBGLESV2_SHADER_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include <string> #include <string>
#include <list> #include <list>
#include <vector> #include <vector>
......
src/libGLESv2/Texture.h
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <vector> #include <vector>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
......
src/libGLESv2/TransformFeedback.h
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
namespace gl namespace gl
{ {
......
src/libGLESv2/Uniform.h
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
#include "angletypes.h" #include "angletypes.h"
......
src/libGLESv2/formatutils.h
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
#ifndef LIBGLESV2_FORMATUTILS_H_ #ifndef LIBGLESV2_FORMATUTILS_H_
#define LIBGLESV2_FORMATUTILS_H_ #define LIBGLESV2_FORMATUTILS_H_
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include "libGLESv2/Caps.h" #include "libGLESv2/Caps.h"
#include "libGLESv2/angletypes.h" #include "libGLESv2/angletypes.h"
......
src/libGLESv2/precompiled.h
...@@ -6,12 +6,7 @@ ...@@ -6,12 +6,7 @@
// precompiled.h: Precompiled header file for libGLESv2. // precompiled.h: Precompiled header file for libGLESv2.
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <assert.h> #include <assert.h>
......
tests/angle_tests/ANGLETest.h
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#include <GLES3/gl3.h> #include "angle_gl.h"
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <algorithm> #include <algorithm>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment