Skip to content

A
angle
Commit f26ddae9 by shannon.woods%transgaming.com@gtempaccount.com
Options

Added the GLES3 headers and updated all locations where the GLES2 headers were…

Added the GLES3 headers and updated all locations where the GLES2 headers were included to also include the GLES3 headers. TRAC #22694 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2069 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 5f339332
Showing with 101 additions and 12 deletions
include/GLES3/gl3ext.h 0 → 100644
#ifndef __gl3ext_h_
#define __gl3ext_h_
/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
/*
* This document is licensed under the SGI Free Software B License Version
* 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
*/
/* OpenGL ES 3 Extensions
*
* After an OES extension's interactions with OpenGl ES 3.0 have been documented,
* its tokens and function definitions should be added to this file in a manner
* that does not conflict with gl2ext.h or gl3.h.
*
* Tokens and function definitions for extensions that have become standard
* features in OpenGL ES 3.0 will not be added to this file.
*
* Applications using OpenGL-ES-2-only extensions should include gl2ext.h
*/
#endif /* __gl3ext_h_ */
include/GLES3/gl3platform.h 0 → 100644
#ifndef __gl3platform_h_
#define __gl3platform_h_
/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
/*
* This document is licensed under the SGI Free Software B License Version
* 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
*/
/* Platform-specific types and definitions for OpenGL ES 3.X gl3.h
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* You are encouraged to submit all modifications to the Khronos group so that
* they can be included in future versions of this file. Please submit changes
* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
* by filing a bug against product "OpenGL-ES" component "Registry".
*/
#include <KHR/khrplatform.h>
#ifndef GL_APICALL
#define GL_APICALL KHRONOS_APICALL
#endif
#ifndef GL_APIENTRY
#define GL_APIENTRY KHRONOS_APIENTRY
#endif
#endif /* __gl3platform_h_ */
samples/gles2_book/Common/esUtil.c
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// //
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
......
samples/gles2_book/Common/esUtil.h
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
/// ///
// Includes // Includes
// //
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <EGL/egl.h> #include <EGL/egl.h>
......
src/common/RefCountObject.h
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <cstddef> #include <cstddef>
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
......
src/compiler/OutputHLSL.h
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <map> #include <map>
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "compiler/intermediate.h" #include "compiler/intermediate.h"
......
src/compiler/Uniform.h
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <vector> #include <vector>
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace sh namespace sh
......
src/libEGL/Config.cpp
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
......
src/libGLESv2/Context.h
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#define LIBGLESV2_CONTEXT_H_ #define LIBGLESV2_CONTEXT_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#define EGLAPI #define EGLAPI
......
src/libGLESv2/HandleAllocator.h
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define LIBGLESV2_HANDLEALLOCATOR_H_ #define LIBGLESV2_HANDLEALLOCATOR_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <vector> #include <vector>
......
src/libGLESv2/ProgramBinary.h
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#define LIBGLESV2_PROGRAM_BINARY_H_ #define LIBGLESV2_PROGRAM_BINARY_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
......
src/libGLESv2/Query.h
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define LIBGLESV2_QUERY_H_ #define LIBGLESV2_QUERY_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "common/angleutils.h" #include "common/angleutils.h"
......
src/libGLESv2/Renderbuffer.h
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define LIBGLESV2_RENDERBUFFER_H_ #define LIBGLESV2_RENDERBUFFER_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "common/angleutils.h" #include "common/angleutils.h"
......
src/libGLESv2/ResourceManager.h
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define LIBGLESV2_RESOURCEMANAGER_H_ #define LIBGLESV2_RESOURCEMANAGER_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#ifdef _MSC_VER #ifdef _MSC_VER
......
src/libGLESv2/Shader.h
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define LIBGLESV2_SHADER_H_ #define LIBGLESV2_SHADER_H_
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <string> #include <string>
#include <list> #include <list>
......
src/libGLESv2/Texture.h
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <vector> #include <vector>
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
......
src/libGLESv2/Uniform.h
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <vector> #include <vector>
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "common/debug.h" #include "common/debug.h"
......
src/libGLESv2/libGLESv2.vcxproj
...@@ -303,6 +303,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -303,6 +303,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClCompile Include="utilities.cpp" /> <ClCompile Include="utilities.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\include\GLES2\gl2.h" />
<ClInclude Include="..\..\include\GLES2\gl2ext.h" />
<ClInclude Include="..\..\include\GLES2\gl2platform.h" />
<ClInclude Include="..\..\include\GLES3\gl3.h" />
<ClInclude Include="..\..\include\GLES3\gl3ext.h" />
<ClInclude Include="..\..\include\GLES3\gl3platform.h" />
<ClInclude Include="..\common\debug.h" /> <ClInclude Include="..\common\debug.h" />
<ClInclude Include="..\common\system.h" /> <ClInclude Include="..\common\system.h" />
<ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" /> <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
...@@ -313,9 +319,6 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -313,9 +319,6 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="Context.h" /> <ClInclude Include="Context.h" />
<ClInclude Include="Fence.h" /> <ClInclude Include="Fence.h" />
<ClInclude Include="Framebuffer.h" /> <ClInclude Include="Framebuffer.h" />
<ClInclude Include="..\..\include\GLES2\gl2.h" />
<ClInclude Include="..\..\include\GLES2\gl2ext.h" />
<ClInclude Include="..\..\include\GLES2\gl2platform.h" />
<ClInclude Include="HandleAllocator.h" /> <ClInclude Include="HandleAllocator.h" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
<ClInclude Include="mathutil.h" /> <ClInclude Include="mathutil.h" />
......
src/libGLESv2/libGLESv2.vcxproj.filters
...@@ -235,15 +235,6 @@ ...@@ -235,15 +235,6 @@
<ClInclude Include="Framebuffer.h"> <ClInclude Include="Framebuffer.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2ext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HandleAllocator.h"> <ClInclude Include="HandleAllocator.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -481,6 +472,24 @@ ...@@ -481,6 +472,24 @@
<ClInclude Include="precompiled.h"> <ClInclude Include="precompiled.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLES3\gl3ext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES3\gl3platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES3\gl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2ext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLES2\gl2.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="renderer\shaders\Blit.ps"> <None Include="renderer\shaders\Blit.ps">
......
src/libGLESv2/precompiled.h
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// precompiled.h: Precompiled header file for libGLESv2. // precompiled.h: Precompiled header file for libGLESv2.
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
......
src/libGLESv2/utilities.h
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#define LIBGLESV2_UTILITIES_H #define LIBGLESV2_UTILITIES_H
#define GL_APICALL #define GL_APICALL
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
......
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