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/Fence.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/Fence.h')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/Fence.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/Fence.h b/src/3rdparty/angle/src/libGLESv2/Fence.h index 9626cb0ff0..1cedebb112 100644 --- a/src/3rdparty/angle/src/libGLESv2/Fence.h +++ b/src/3rdparty/angle/src/libGLESv2/Fence.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. +// Copyright (c) 2002-2013 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. // @@ -9,15 +9,12 @@ #ifndef LIBGLESV2_FENCE_H_ #define LIBGLESV2_FENCE_H_ -#define GL_APICALL -#include <GLES2/gl2.h> -#include <d3d9.h> - #include "common/angleutils.h" -namespace egl +namespace rx { -class Display; +class Renderer; +class FenceImpl; } namespace gl @@ -26,7 +23,7 @@ namespace gl class Fence { public: - explicit Fence(egl::Display* display); + explicit Fence(rx::Renderer *renderer); virtual ~Fence(); GLboolean isFence(); @@ -38,10 +35,7 @@ class Fence private: DISALLOW_COPY_AND_ASSIGN(Fence); - egl::Display* mDisplay; - IDirect3DQuery9* mQuery; - GLenum mCondition; - GLboolean mStatus; + rx::FenceImpl *mFence; }; } |