Implemented D3D11 offscreen texture share handle support.

src/libEGL/Config.cpp

@@ -59,6 +59,14 @@ Config::Config(rx::ConfigDesc desc, EGLint minInterval, EGLint maxInterval, EGLi
         mAlphaSize = 0;
         mBindToTextureRGB = true;
         break;
+      case GL_BGRA8_EXT:
+        mBufferSize = 32;
+        mRedSize = 8;
+        mGreenSize = 8;
+        mBlueSize = 8;
+        mAlphaSize = 8;
+        mBindToTextureRGBA = true;
+        break;
       default:
         UNREACHABLE();   // Other formats should not be valid
     }

src/libGLESv2/renderer/Renderer11.cpp

@@ -41,6 +41,7 @@ namespace rx
 {
 static const DXGI_FORMAT RenderTargetFormats[] =
     {
+        DXGI_FORMAT_B8G8R8A8_UNORM,
         DXGI_FORMAT_R8G8B8A8_UNORM
     };
 
@@ -1892,11 +1893,10 @@ bool Renderer11::getInstancingSupport() const
 
 bool Renderer11::getShareHandleSupport() const
 {
-    // TODO
-    // UNIMPLEMENTED();
-
+    // We only currently support share handles with BGRA surfaces, because
+    // chrome needs BGRA. Once chrome fixes this, we should always support them.
     // PIX doesn't seem to support using share handles, so disable them.
-    return false && !gl::perfActive();
+    return getBGRATextureSupport() && !gl::perfActive();
 }
 
 bool Renderer11::getDerivativeInstructionSupport() const

src/libGLESv2/renderer/SwapChain11.cpp

@@ -40,6 +40,7 @@ SwapChain11::SwapChain11(Renderer11 *renderer, HWND window, HANDLE shareHandle,
     mPassThroughPS = NULL;
     mWidth = -1;
     mHeight = -1;
+    mAppCreatedShareHandle = mShareHandle != NULL;
 }
 
 SwapChain11::~SwapChain11()
@@ -127,8 +128,10 @@ void SwapChain11::release()
         mPassThroughPS = NULL;
     }
 
-    if (mWindow)
+    if (!mAppCreatedShareHandle)
+    {
         mShareHandle = NULL;
+    }
 }
 
 EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swapInterval)
@@ -190,44 +193,107 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
         mDepthStencilDSView = NULL;
     }
 
-    HANDLE *pShareHandle = NULL;
-    if (!mWindow && mRenderer->getShareHandleSupport())
+    // If the app passed in a share handle, open the resource
+    // See EGL_ANGLE_d3d_share_handle_client_buffer
+    if (mAppCreatedShareHandle)
     {
-        pShareHandle = &mShareHandle;
-    }
+        ID3D11Resource *tempResource11;
+        HRESULT result = device->OpenSharedResource(mShareHandle, __uuidof(ID3D11Resource), (void**)&tempResource11);
 
-    D3D11_TEXTURE2D_DESC offscreenTextureDesc = {0};
-    offscreenTextureDesc.Width = backbufferWidth;
-    offscreenTextureDesc.Height = backbufferHeight;
-    offscreenTextureDesc.Format = gl_d3d11::ConvertRenderbufferFormat(mBackBufferFormat);
-    offscreenTextureDesc.MipLevels = 1;
-    offscreenTextureDesc.ArraySize = 1;
-    offscreenTextureDesc.SampleDesc.Count = 1;
-    offscreenTextureDesc.SampleDesc.Quality = 0;
-    offscreenTextureDesc.Usage = D3D11_USAGE_DEFAULT;
-    offscreenTextureDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
-    offscreenTextureDesc.CPUAccessFlags = 0;
-    offscreenTextureDesc.MiscFlags = 0;   // D3D11_RESOURCE_MISC_SHARED
+        if (FAILED(result))
+        {
+            ERR("Failed to open the swap chain pbuffer share handle: %08lX", result);
+            release();
+            return EGL_BAD_PARAMETER;
+        }
 
-    HRESULT result = device->CreateTexture2D(&offscreenTextureDesc, NULL, &mOffscreenTexture);
-    d3d11::SetDebugName(mOffscreenTexture, "Offscreen texture");
+        result = tempResource11->QueryInterface(__uuidof(ID3D11Texture2D), (void**)&mOffscreenTexture);
+        tempResource11->Release();
 
-    if (FAILED(result))
+        if (FAILED(result))
+        {
+            ERR("Failed to query texture2d interface in pbuffer share handle: %08lX", result);
+            release();
+            return EGL_BAD_PARAMETER;
+        }
+
+        // Validate offscreen texture parameters
+        D3D11_TEXTURE2D_DESC offscreenTextureDesc = {0};
+        mOffscreenTexture->GetDesc(&offscreenTextureDesc);
+
+        if (offscreenTextureDesc.Width != (UINT)backbufferWidth
+            || offscreenTextureDesc.Height != (UINT)backbufferHeight
+            || offscreenTextureDesc.Format != gl_d3d11::ConvertRenderbufferFormat(mBackBufferFormat)
+            || offscreenTextureDesc.MipLevels != 1
+            || offscreenTextureDesc.ArraySize != 1)
+        {
+            ERR("Invalid texture parameters in the shared offscreen texture pbuffer");
+            release();
+            return EGL_BAD_PARAMETER;
+        }
+    }
+    else
     {
-        ERR("Could not create offscreen texture: %08lX", result);
-        release();
+        const bool useSharedResource = !mWindow && mRenderer->getShareHandleSupport();
+
+        D3D11_TEXTURE2D_DESC offscreenTextureDesc = {0};
+        offscreenTextureDesc.Width = backbufferWidth;
+        offscreenTextureDesc.Height = backbufferHeight;
+        offscreenTextureDesc.Format = gl_d3d11::ConvertRenderbufferFormat(mBackBufferFormat);
+        offscreenTextureDesc.MipLevels = 1;
+        offscreenTextureDesc.ArraySize = 1;
+        offscreenTextureDesc.SampleDesc.Count = 1;
+        offscreenTextureDesc.SampleDesc.Quality = 0;
+        offscreenTextureDesc.Usage = D3D11_USAGE_DEFAULT;
+        offscreenTextureDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
+        offscreenTextureDesc.CPUAccessFlags = 0;
+        offscreenTextureDesc.MiscFlags = useSharedResource ? D3D11_RESOURCE_MISC_SHARED : 0;
+
+        HRESULT result = device->CreateTexture2D(&offscreenTextureDesc, NULL, &mOffscreenTexture);
 
-        if (isDeviceLostError(result))
+        if (FAILED(result))
         {
-            return EGL_CONTEXT_LOST;
+            ERR("Could not create offscreen texture: %08lX", result);
+            release();
+
+            if (isDeviceLostError(result))
+            {
+                return EGL_CONTEXT_LOST;
+            }
+            else
+            {
+                return EGL_BAD_ALLOC;
+            }
         }
-        else
+
+        d3d11::SetDebugName(mOffscreenTexture, "Offscreen texture");
+
+        // EGL_ANGLE_surface_d3d_texture_2d_share_handle requires that we store a share handle for the client
+        if (useSharedResource)
         {
-            return EGL_BAD_ALLOC;
+            IDXGIResource *offscreenTextureResource = NULL;
+            result = mOffscreenTexture->QueryInterface(__uuidof(IDXGIResource), (void**)&offscreenTextureResource);
+
+            // Fall back to no share handle on failure
+            if (FAILED(result))
+            {
+                ERR("Could not query offscreen texture resource: %08lX", result);
+            }
+            else
+            {
+                result = offscreenTextureResource->GetSharedHandle(&mShareHandle);
+
+                if (FAILED(result))
+                {
+                    mShareHandle = NULL;
+                    ERR("Could not get offscreen texture shared handle: %08lX", result);
+                }
+            }
         }
     }
         
-    result = device->CreateRenderTargetView(mOffscreenTexture, NULL, &mOffscreenRTView);
+    HRESULT result = device->CreateRenderTargetView(mOffscreenTexture, NULL, &mOffscreenRTView);
+
     ASSERT(SUCCEEDED(result));
     d3d11::SetDebugName(mOffscreenRTView, "Offscreen render target");
 

src/libGLESv2/renderer/SwapChain11.h

@@ -47,6 +47,7 @@ class SwapChain11 : public SwapChain
     Renderer11 *mRenderer;
     EGLint mHeight;
     EGLint mWidth;
+    bool mAppCreatedShareHandle;
 
     IDXGISwapChain *mSwapChain;
 

src/libGLESv2/renderer/renderer11_utils.cpp

@@ -217,6 +217,7 @@ GLenum ConvertBackBufferFormat(DXGI_FORMAT format)
     switch (format)
     {
       case DXGI_FORMAT_R8G8B8A8_UNORM: return GL_RGBA8_OES;
+      case DXGI_FORMAT_B8G8R8A8_UNORM: return GL_BGRA8_EXT;
       default:
         UNREACHABLE();
     }
@@ -240,6 +241,8 @@ GLenum ConvertRenderbufferFormat(DXGI_FORMAT format)
 {
     switch (format)
     {
+      case DXGI_FORMAT_B8G8R8A8_UNORM:
+        return GL_BGRA8_EXT;
       case DXGI_FORMAT_R8G8B8A8_UNORM:
         return GL_RGBA8_OES;
       case DXGI_FORMAT_D24_UNORM_S8_UINT:
@@ -307,6 +310,8 @@ DXGI_FORMAT ConvertRenderbufferFormat(GLenum format)
       case GL_RGB565:
       case GL_RGB8_OES:
         return DXGI_FORMAT_R8G8B8A8_UNORM;
+      case GL_BGRA8_EXT:
+        return DXGI_FORMAT_B8G8R8A8_UNORM;
       case GL_DEPTH_COMPONENT16:
       case GL_STENCIL_INDEX8:
       case GL_DEPTH24_STENCIL8_OES:

src/libGLESv2/utilities.cpp

@@ -533,6 +533,8 @@ bool IsColorRenderable(GLenum internalformat)
       case GL_STENCIL_INDEX8:
       case GL_DEPTH24_STENCIL8_OES:
         return false;
+      case GL_BGRA8_EXT:
+          return true;
       default:
         UNIMPLEMENTED();
     }