1 files changed, 9 insertions, 85 deletions

diff --git a/src/3rdparty/angle/src/libEGL/Display.h b/src/3rdparty/angle/src/libEGL/Display.h
index 23b57b74c6..8c71e51b7a 100644
--- a/src/3rdparty/angle/src/libEGL/Display.h
+++ b/src/3rdparty/angle/src/libEGL/Display.h
@@ -11,36 +11,22 @@
 #ifndef LIBEGL_DISPLAY_H_
 #define LIBEGL_DISPLAY_H_
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <d3d9.h>
+#include "common/system.h"
 
 #include <set>
 #include <vector>
 
-#include "libGLESv2/Context.h"
-
 #include "libEGL/Config.h"
-#include "libEGL/ShaderCache.h"
-#include "libEGL/Surface.h"
-
-const int versionWindowsVista = MAKEWORD(0x00, 0x06);
-const int versionWindows7 = MAKEWORD(0x01, 0x06);
 
-// Return the version of the operating system in a format suitable for ordering
-// comparison.
-inline int getComparableOSVersion()
+namespace gl
 {
-    DWORD version = GetVersion();
-    int majorVersion = LOBYTE(LOWORD(version));
-    int minorVersion = HIBYTE(LOWORD(version));
-    return MAKEWORD(minorVersion, majorVersion);
+class Context;
 }
 
 namespace egl
 {
+class Surface;
+
 class Display
 {
   public:
@@ -49,9 +35,6 @@ class Display
     bool initialize();
     void terminate();
 
-    virtual void startScene();
-    virtual void endScene();
-
     static egl::Display *getDisplay(EGLNativeDisplayType displayId);
 
     bool getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint configSize, EGLint *numConfig);
@@ -70,81 +53,25 @@ class Display
     bool isValidSurface(egl::Surface *surface);
     bool hasExistingWindowSurface(HWND window);
 
-    EGLint getMinSwapInterval();
-    EGLint getMaxSwapInterval();
-
-    virtual IDirect3DDevice9 *getDevice();
-    virtual D3DCAPS9 getDeviceCaps();
-    virtual D3DADAPTER_IDENTIFIER9 *getAdapterIdentifier();
-    virtual bool testDeviceLost();
-    virtual bool testDeviceResettable();
-    virtual void sync(bool block);
-    virtual IDirect3DQuery9* allocateEventQuery();
-    virtual void freeEventQuery(IDirect3DQuery9* query);
-    virtual void getMultiSampleSupport(D3DFORMAT format, bool *multiSampleArray);
-    virtual bool getDXT1TextureSupport();
-    virtual bool getDXT3TextureSupport();
-    virtual bool getDXT5TextureSupport();
-    virtual bool getEventQuerySupport();
-    virtual bool getFloat32TextureSupport(bool *filtering, bool *renderable);
-    virtual bool getFloat16TextureSupport(bool *filtering, bool *renderable);
-    virtual bool getLuminanceTextureSupport();
-    virtual bool getLuminanceAlphaTextureSupport();
-    virtual bool getVertexTextureSupport() const;
-    virtual bool getNonPower2TextureSupport() const;
-    virtual bool getDepthTextureSupport() const;
-    virtual bool getOcclusionQuerySupport() const;
-    virtual bool getInstancingSupport() const;
-    virtual float getTextureFilterAnisotropySupport() const;
-    virtual D3DPOOL getBufferPool(DWORD usage) const;
-    virtual D3DPOOL getTexturePool(DWORD usage) const;
+    rx::Renderer *getRenderer() { return mRenderer; };
 
+    // exported methods must be virtual
     virtual void notifyDeviceLost();
-    bool isDeviceLost();
+    virtual void recreateSwapChains();
 
-    bool isD3d9ExDevice() const { return mD3d9Ex != NULL; }
     const char *getExtensionString() const;
-    bool shareHandleSupported() const;
-
-    virtual IDirect3DVertexShader9 *createVertexShader(const DWORD *function, size_t length);
-    virtual IDirect3DPixelShader9 *createPixelShader(const DWORD *function, size_t length);
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Display);
 
     Display(EGLNativeDisplayType displayId, HDC deviceContext, bool software);
 
-    D3DPRESENT_PARAMETERS getDefaultPresentParameters();
-
     bool restoreLostDevice();
 
     EGLNativeDisplayType mDisplayId;
     const HDC mDc;
 
-    HMODULE mD3d9Module;
-    
-    UINT mAdapter;
-    D3DDEVTYPE mDeviceType;
-    IDirect3D9 *mD3d9;  // Always valid after successful initialization.
-    IDirect3D9Ex *mD3d9Ex;  // Might be null if D3D9Ex is not supported.
-    IDirect3DDevice9 *mDevice;
-    IDirect3DDevice9Ex *mDeviceEx;  // Might be null if D3D9Ex is not supported.
-
-    // A pool of event queries that are currently unused.
-    std::vector<IDirect3DQuery9*> mEventQueryPool;
-
-    VertexShaderCache mVertexShaderCache;
-    PixelShaderCache mPixelShaderCache;
-
-    D3DCAPS9 mDeviceCaps;
-    D3DADAPTER_IDENTIFIER9 mAdapterIdentifier;
-    HWND mDeviceWindow;
-
-    bool mSceneStarted;
-    EGLint mMaxSwapInterval;
-    EGLint mMinSwapInterval;
     bool mSoftwareDevice;
-    bool mSupportsNonPower2Textures;
     
     typedef std::set<Surface*> SurfaceSet;
     SurfaceSet mSurfaceSet;
@@ -153,11 +80,8 @@ class Display
 
     typedef std::set<gl::Context*> ContextSet;
     ContextSet mContextSet;
-    bool mDeviceLost;
 
-    bool createDevice();
-    void initializeDevice();
-    bool resetDevice();
+    rx::Renderer *mRenderer;
 
     void initExtensionString();
     std::string mExtensionString;