Move display extension initialization to DisplayImpl.

src/libANGLE/Display.cpp

@@ -657,25 +657,7 @@ const std::string &Display::getClientExtensionString()
 
 void Display::initDisplayExtensions()
 {
-    mDisplayExtensions.createContextRobustness = true;
-
-    // ANGLE-specific extensions
-    if (mRenderer->getShareHandleSupport())
-    {
-        mDisplayExtensions.d3dShareHandleClientBuffer = true;
-        mDisplayExtensions.surfaceD3DTexture2DShareHandle = true;
-    }
-
-    mDisplayExtensions.querySurfacePointer = true;
-    mDisplayExtensions.windowFixedSize = true;
-
-    if (mRenderer->getPostSubBufferSupport())
-    {
-        mDisplayExtensions.postSubBuffer = true;
-    }
-
-    mDisplayExtensions.createContext = true;
-
+    mDisplayExtensions = mImplementation->getExtensions();
     mDisplayExtensionString = GenerateExtensionsString(mDisplayExtensions);
 }
 

src/libANGLE/renderer/DisplayImpl.cpp

@@ -13,6 +13,11 @@
 namespace rx
 {
 
+DisplayImpl::DisplayImpl()
+    : mExtensionsInitialized(false)
+{
+}
+
 DisplayImpl::~DisplayImpl()
 {
     while (!mSurfaceSet.empty())
@@ -27,4 +32,15 @@ void DisplayImpl::destroySurface(egl::Surface *surface)
     SafeDelete(surface);
 }
 
+const egl::DisplayExtensions &DisplayImpl::getExtensions() const
+{
+    if (!mExtensionsInitialized)
+    {
+        generateExtensions(&mExtensions);
+        mExtensionsInitialized = true;
+    }
+
+    return mExtensions;
+}
+
 }

src/libANGLE/renderer/DisplayImpl.h

@@ -10,6 +10,7 @@
 #define LIBANGLE_RENDERER_DISPLAYIMPL_H_
 
 #include "common/angleutils.h"
+#include "libANGLE/Caps.h"
 #include "libANGLE/Error.h"
 
 #include <set>
@@ -28,7 +29,7 @@ class SurfaceImpl;
 class DisplayImpl
 {
   public:
-    DisplayImpl() {}
+    DisplayImpl();
     virtual ~DisplayImpl();
 
     virtual SurfaceImpl *createWindowSurface(egl::Display *display, const egl::Config *config,
@@ -47,6 +48,8 @@ class DisplayImpl
 
     void destroySurface(egl::Surface *surface);
 
+    const egl::DisplayExtensions &getExtensions() const;
+
   protected:
     // Place the surface set here so it can be accessible for handling
     // context loss events. (It is shared between the Display and Impl.)
@@ -54,6 +57,11 @@ class DisplayImpl
 
   private:
     DISALLOW_COPY_AND_ASSIGN(DisplayImpl);
+
+    virtual void generateExtensions(egl::DisplayExtensions *outExtensions) const = 0;
+
+    mutable bool mExtensionsInitialized;
+    mutable egl::DisplayExtensions mExtensions;
 };
 
 }

src/libANGLE/renderer/Renderer.h

@@ -84,10 +84,6 @@ class Renderer
                                    const GLvoid *indices, GLsizei instances,
                                    const RangeUI &indexRange) = 0;
 
-    // TODO(jmadill): caps? and virtual for egl::Display
-    virtual bool getShareHandleSupport() const = 0;
-    virtual bool getPostSubBufferSupport() const = 0;
-
     // Shader creation
     virtual CompilerImpl *createCompiler(const gl::Data &data) = 0;
     virtual ShaderImpl *createShader(GLenum type) = 0;

src/libANGLE/renderer/d3d/DisplayD3D.cpp

@@ -75,4 +75,26 @@ bool DisplayD3D::isValidNativeWindow(EGLNativeWindowType window) const
     return NativeWindow::isValidNativeWindow(window);
 }
 
+void DisplayD3D::generateExtensions(egl::DisplayExtensions *outExtensions) const
+{
+    outExtensions->createContextRobustness = true;
+
+    // ANGLE-specific extensions
+    if (mRenderer->getShareHandleSupport())
+    {
+        outExtensions->d3dShareHandleClientBuffer = true;
+        outExtensions->surfaceD3DTexture2DShareHandle = true;
+    }
+
+    outExtensions->querySurfacePointer = true;
+    outExtensions->windowFixedSize = true;
+
+    if (mRenderer->getPostSubBufferSupport())
+    {
+        outExtensions->postSubBuffer = true;
+    }
+
+    outExtensions->createContext = true;
+}
+
 }

src/libANGLE/renderer/d3d/DisplayD3D.h

@@ -32,6 +32,8 @@ class DisplayD3D : public DisplayImpl
   private:
     DISALLOW_COPY_AND_ASSIGN(DisplayD3D);
 
+    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
+
     rx::RendererD3D *mRenderer;
 };