Add querySurfacePointerANGLE method to Surface.

src/libANGLE/Surface.cpp

@@ -8,17 +8,16 @@
 // such as the client area of a window, including any back buffers.
 // Implements EGLSurface and related functionality. [EGL 1.4] section 2.2 page 3.
 
-#include <tchar.h>
-
-#include <algorithm>
-
 #include "libANGLE/Surface.h"
 
 #include "common/debug.h"
+#include "libANGLE/Display.h"
 #include "libANGLE/Texture.h"
 #include "libANGLE/renderer/SwapChain.h"
 
-#include "libANGLE/Display.h"
+#include <algorithm>
+#include <tchar.h>
+#include <EGL/eglext.h>
 
 //TODO(jmadill): phase this out
 #include "libANGLE/renderer/d3d/RendererD3D.h"
@@ -382,6 +381,14 @@ Error Surface::postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint height)
     return swapRect(x, y, width, height);
 }
 
+Error Surface::querySurfacePointerANGLE(EGLint attribute, void **value)
+{
+    // TODO(jmadill): MANGLE refactor
+    ASSERT(attribute == EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE);
+    *value = mSwapChain->getShareHandle();
+    return Error(EGL_SUCCESS);
+}
+
 EGLint Surface::isPostSubBufferSupported() const
 {
     return mPostSubBufferSupported;

src/libANGLE/Surface.h

@@ -50,6 +50,7 @@ class Surface
     EGLNativeWindowType getWindowHandle();
     Error swap();
     Error postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint height);
+    Error querySurfacePointerANGLE(EGLint attribute, void **value);
 
     virtual EGLint isPostSubBufferSupported() const;
 

src/libEGL/libEGL.cpp

@@ -598,21 +598,19 @@ EGLBoolean __stdcall eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surf
         return EGL_FALSE;
     }
 
+    // validate the attribute parameter
     switch (attribute)
     {
       case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
-        {
-            rx::SwapChain *swapchain = eglSurface->getSwapChain();
-            *value = (void*) (swapchain ? swapchain->getShareHandle() : NULL);
-        }
         break;
       default:
         recordError(egl::Error(EGL_BAD_ATTRIBUTE));
         return EGL_FALSE;
     }
 
-    recordError(egl::Error(EGL_SUCCESS));
-    return EGL_TRUE;
+    egl::Error error = eglSurface->querySurfacePointerANGLE(attribute, value);
+    recordError(error);
+    return (error.isError() ? EGL_FALSE : EGL_TRUE);
 }
 
 EGLBoolean __stdcall eglBindAPI(EGLenum api)