diff options
author | Andrew Knight <andrew.knight@digia.com> | 2013-04-03 19:57:09 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 11:35:44 +0200 |
commit | 710ad8ce1bd5d01ce048851d210ac3831ca17dde (patch) | |
tree | bb3f645e57a7887341113275c9caa2583f7e2dfa /src/3rdparty/angle/src/libGLESv2/main.h | |
parent | 8307ab784eb4d8d22441ee61f02cb381684ca3a2 (diff) |
Upgrade ANGLE to DX11 Proto
Upgrades ANGLE to dx11proto (dx11-MRT-support tag), which splits out support
for DirectX9 & DirectX11. The DX9 codepath is used by default;
CONFIG+=angle_d3d11 must be passed to the ANGLE project to build for DX11.
Existing patches to ANGLE have been updated (or removed if no longer
needed), and a patch has been added to make DX9/DX11 codepaths mutually
exclusive.
Change-Id: Ibe13befadb94f04883eca449d0ee1f0da955ff92
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Axel Waggershauser <awagger@gmail.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/main.h')
-rw-r--r-- | src/3rdparty/angle/src/libGLESv2/main.h | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/main.h b/src/3rdparty/angle/src/libGLESv2/main.h index 504848aa65..9168a2212e 100644 --- a/src/3rdparty/angle/src/libGLESv2/main.h +++ b/src/3rdparty/angle/src/libGLESv2/main.h @@ -9,17 +9,19 @@ #ifndef LIBGLESV2_MAIN_H_ #define LIBGLESV2_MAIN_H_ -#define GL_APICALL -#include <GLES2/gl2.h> -#include <GLES2/gl2ext.h> - #include "common/debug.h" -#include "libEGL/Display.h" +#include "common/system.h" -#include "libGLESv2/Context.h" +namespace egl +{ +class Display; +class Surface; +} namespace gl { +class Context; + struct Current { Context *context; @@ -32,11 +34,6 @@ Context *getContext(); Context *getNonLostContext(); egl::Display *getDisplay(); -IDirect3DDevice9 *getDevice(); - -bool checkDeviceLost(HRESULT errorCode); -} - void error(GLenum errorCode); template<class T> @@ -47,4 +44,25 @@ const T &error(GLenum errorCode, const T &returnValue) return returnValue; } +} + +namespace rx +{ +class Renderer; +} + +extern "C" +{ +// Exported functions for use by EGL +gl::Context *glCreateContext(const gl::Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess); +void glDestroyContext(gl::Context *context); +void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface); +gl::Context *glGetCurrentContext(); +rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice); +void glDestroyRenderer(rx::Renderer *renderer); + +__eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname); +bool __stdcall glBindTexImage(egl::Surface *surface); +} + #endif // LIBGLESV2_MAIN_H_ |