Store mShareHandle in SurfaceD3D.

src/libANGLE/renderer/SurfaceImpl.cpp

@@ -15,14 +15,13 @@ namespace rx
 
 SurfaceImpl::SurfaceImpl(egl::Display *display, const egl::Config *config,
                          EGLint fixedSize, EGLint postSubBufferSupported, EGLenum textureFormat,
-                         EGLenum textureType, EGLClientBuffer shareHandle)
+                         EGLenum textureType)
     : mDisplay(display),
       mConfig(config),
       mFixedSize(fixedSize),
       mPostSubBufferSupported(postSubBufferSupported),
       mTextureFormat(textureFormat),
-      mTextureTarget(textureType),
-      mShareHandle(shareHandle)
+      mTextureTarget(textureType)
 {
 }
 

src/libANGLE/renderer/SurfaceImpl.h

@@ -26,7 +26,7 @@ class SurfaceImpl
   public:
     SurfaceImpl(egl::Display *display, const egl::Config *config,
                 EGLint fixedSize, EGLint postSubBufferSupported, EGLenum textureFormat,
-                EGLenum textureType, EGLClientBuffer shareHandle);
+                EGLenum textureType);
     virtual ~SurfaceImpl();
 
     virtual egl::Error initialize() = 0;
@@ -59,8 +59,7 @@ class SurfaceImpl
           mFixedSize(0),
           mPostSubBufferSupported(0),
           mTextureFormat(EGL_NONE),
-          mTextureTarget(EGL_NONE),
-          mShareHandle(static_cast<EGLClientBuffer>(0))
+          mTextureTarget(EGL_NONE)
     {}
 
     egl::Display *const mDisplay;
@@ -78,7 +77,6 @@ class SurfaceImpl
     EGLenum mTextureTarget;        // Type of texture: 2D or no texture
 //  EGLenum vgAlphaFormat;         // Alpha format for OpenVG
 //  EGLenum vgColorSpace;          // Color space for OpenVG
-    EGLClientBuffer mShareHandle;
 
   private:
     DISALLOW_COPY_AND_ASSIGN(SurfaceImpl);

src/libANGLE/renderer/d3d/SurfaceD3D.cpp

@@ -37,7 +37,7 @@ SurfaceD3D *SurfaceD3D::createFromWindow(RendererD3D *renderer, egl::Display *di
 SurfaceD3D::SurfaceD3D(RendererD3D *renderer, egl::Display *display, const egl::Config *config, EGLint width, EGLint height,
                        EGLint fixedSize, EGLint postSubBufferSupported, EGLenum textureFormat,
                        EGLenum textureType, EGLClientBuffer shareHandle, EGLNativeWindowType window)
-    : SurfaceImpl(display, config, fixedSize, postSubBufferSupported, textureFormat, textureType, shareHandle),
+    : SurfaceImpl(display, config, fixedSize, postSubBufferSupported, textureFormat, textureType),
       mRenderer(renderer),
       mSwapChain(NULL),
       mSwapIntervalDirty(true),
@@ -45,7 +45,8 @@ SurfaceD3D::SurfaceD3D(RendererD3D *renderer, egl::Display *display, const egl::
       mNativeWindow(window),
       mWidth(width),
       mHeight(height),
-      mSwapInterval(1)
+      mSwapInterval(1),
+      mShareHandle(reinterpret_cast<HANDLE*>(shareHandle))
 {
     subclassWindow();
 }
@@ -117,7 +118,7 @@ egl::Error SurfaceD3D::resetSwapChain()
         height = mHeight;
     }
 
-    mSwapChain = mRenderer->createSwapChain(mNativeWindow, static_cast<HANDLE>(mShareHandle),
+    mSwapChain = mRenderer->createSwapChain(mNativeWindow, mShareHandle,
                                             mConfig->renderTargetFormat,
                                             mConfig->depthStencilFormat);
     if (!mSwapChain)

src/libANGLE/renderer/d3d/SurfaceD3D.h

@@ -80,6 +80,8 @@ class SurfaceD3D : public SurfaceImpl
     EGLint mHeight;
 
     EGLint mSwapInterval;
+
+    HANDLE mShareHandle;
 };