From a6a12d8c0fc918972c15268f749ecc7c90b95d6c Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Tue, 5 Aug 2014 12:59:44 +0300 Subject: ANGLE: upgrade to 2.1~07d49ef5350a This version of ANGLE provides partial ES3 support, numerous bug fixes, and several potentially useful vendor extensions. All patches have been rebased. The following changes are noted: 0000-General-fixes-for-ANGLE-2.1.patch contains compile fixes for the new ANGLE 0004-Make-it-possible-to-link-ANGLE-statically-for-single.patch has incorporated patch 0015. 0007-Make-DX9-DX11-mutually-exclusive.patch has been removed as it was fixed upstream. 0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch has been moved up to fill the patch number gap. 0010-ANGLE-Enable-D3D11-for-feature-level-9-cards.patch now contains patch 0014 and 0017. 0013-ANGLE-Allow-for-universal-program-binaries.patch has been removed as it is no longer relevant. 0014-ANGLE-D3D11-Fix-internal-index-buffer-for-level-9-ha.patch has been merged with patch 0010. 0015-ANGLE-Don-t-export-DLLMain-functions-for-static-buil.patch has been merged with patch 0004. 0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch has been removed and will be replaced by a follow-up patch using a different technique. 0017-ANGLE-D3D11-Don-t-use-mipmaps-in-level-9-textures.patch has been merged with patch 0010. 0018-ANGLE-WinRT-Create-swap-chain-using-physical-resolut.patch has been removed and will be replaced by a follow-up patch extending the EGL_ANGLE_window_fixed_size extension. 0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch is now patch 0007. [ChangeLog][Third-party libraries] ANGLE has been upgraded to version 2.1, bringing partial support for OpenGL ES3 over Direct3D 11, numerous bug fixes, and several new vendor extensions. Change-Id: I6d95ce1480462d67228d83c1e5c74a1706b5b21c Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/src/libEGL/Surface.h | 54 +++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 9 deletions(-) (limited to 'src/3rdparty/angle/src/libEGL/Surface.h') diff --git a/src/3rdparty/angle/src/libEGL/Surface.h b/src/3rdparty/angle/src/libEGL/Surface.h index 1d2303c6eb..ebffce8fed 100644 --- a/src/3rdparty/angle/src/libEGL/Surface.h +++ b/src/3rdparty/angle/src/libEGL/Surface.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved. +// Copyright (c) 2002-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. // @@ -11,11 +11,24 @@ #ifndef LIBEGL_SURFACE_H_ #define LIBEGL_SURFACE_H_ -#define EGLAPI #include #include "common/angleutils.h" +#if defined(ANGLE_PLATFORM_WINRT) +#include +namespace ABI { namespace Windows { + namespace UI { namespace Core { + struct ICoreWindow; + struct IWindowSizeChangedEventArgs; + } } + namespace Graphics { namespace Display { + struct IDisplayInformation; + } } +} } +struct IInspectable; +#endif + namespace gl { class Texture2D; @@ -34,10 +47,10 @@ class Config; class Surface { public: - Surface(Display *display, const egl::Config *config, EGLNativeWindowType window, EGLint postSubBufferSupported); + Surface(Display *display, const egl::Config *config, EGLNativeWindowType window, EGLint fixedSize, EGLint width, EGLint height, EGLint postSubBufferSupported); Surface(Display *display, const egl::Config *config, HANDLE shareHandle, EGLint width, EGLint height, EGLenum textureFormat, EGLenum textureTarget); - ~Surface(); + virtual ~Surface(); bool initialize(); void release(); @@ -47,9 +60,6 @@ class Surface bool swap(); bool postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint height); - virtual EGLint getWidth() const; - virtual EGLint getHeight() const; - virtual EGLint isPostSubBufferSupported() const; virtual rx::SwapChain *getSwapChain() const; @@ -57,6 +67,12 @@ class Surface void setSwapInterval(EGLint interval); bool checkForOutOfDateSwapChain(); // Returns true if swapchain changed due to resize or interval update + virtual EGLint getConfigID() const; + virtual EGLint getWidth() const; + virtual EGLint getHeight() const; + virtual EGLint getPixelAspectRatio() const; + virtual EGLenum getRenderBuffer() const; + virtual EGLenum getSwapBehavior() const; virtual EGLenum getTextureFormat() const; virtual EGLenum getTextureTarget() const; virtual EGLenum getFormat() const; @@ -64,9 +80,19 @@ class Surface virtual void setBoundTexture(gl::Texture2D *texture); virtual gl::Texture2D *getBoundTexture() const; + EGLint isFixedSize() const; + private: DISALLOW_COPY_AND_ASSIGN(Surface); +#if defined(ANGLE_PLATFORM_WINRT) + HRESULT onSizeChanged(ABI::Windows::UI::Core::ICoreWindow *, ABI::Windows::UI::Core::IWindowSizeChangedEventArgs *); + HRESULT onDpiChanged(ABI::Windows::Graphics::Display::IDisplayInformation *, IInspectable *); +# if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP + HRESULT onOrientationChanged(ABI::Windows::Graphics::Display::IDisplayInformation *, IInspectable *); +# endif +#endif + Display *const mDisplay; rx::Renderer *mRenderer; @@ -79,7 +105,7 @@ private: bool resetSwapChain(int backbufferWidth, int backbufferHeight); bool swapRect(EGLint x, EGLint y, EGLint width, EGLint height); - const EGLNativeWindowType mWindow; // Window that the surface is created for. + const EGLNativeWindowType mWindow; // Window that the surface is created for. bool mWindowSubclassed; // Indicates whether we successfully subclassed mWindow for WM_RESIZE hooking const egl::Config *mConfig; // EGL config surface was created with EGLint mHeight; // Height of surface @@ -99,9 +125,19 @@ private: // EGLenum vgColorSpace; // Color space for OpenVG EGLint mSwapInterval; EGLint mPostSubBufferSupported; - + EGLint mFixedSize; + EGLint mSwapFlags; + bool mSwapIntervalDirty; gl::Texture2D *mTexture; +#if defined(ANGLE_PLATFORM_WINRT) + double mScaleFactor; + EventRegistrationToken mSizeToken; + EventRegistrationToken mDpiToken; +# if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP + EventRegistrationToken mOrientationToken; +# endif +#endif }; } -- cgit v1.2.3