Enhancement of RenderTargetBitmap to Support Hardware Rendering

src/Microsoft.DotNet.Wpf/src/WpfGfx/core/api/api_factory.cpp

@@ -279,31 +279,38 @@ CMILFactory::CreateBitmapRenderTarget(
     }
     if (SUCCEEDED(hr))
     {
-        if ((format != MilPixelFormat::PBGRA32bpp) && (format != MilPixelFormat::PRGBA128bppFloat))
+        if (format != MilPixelFormat::PBGRA32bpp)
         {
             MIL_THR(WGXERR_UNSUPPORTEDPIXELFORMAT);
         }
     }
 
+    CHybridSurfaceRenderTarget *pRenderTarget = NULL;
     if (SUCCEEDED(hr))
     {
-        if ( !(dwFlags & MilRTInitialization::HardwareOnly) )
-        {
-            MIL_THR(CSwRenderTargetBitmap::Create(
+        CDisplaySet const *pDisplaySet = NULL; 
+        GetCurrentDisplaySet(&pDisplaySet);  // pDisplaySet can be NULL so we dont need to get hr
+
+        MIL_THR(CHybridSurfaceRenderTarget::Create(
+            pDisplaySet,
+            dwFlags,
+            dpiX,
+            dpiY,
+            OUT &pRenderTarget));
+    }
+    if (SUCCEEDED(hr))
+    {
+        IntermediateRTUsage rtUsage;
+        rtUsage.flags = IntermediateRTUsage::ForBlending;
+        rtUsage.wrapMode = MilBitmapWrapMode::Extend;
+        MIL_THR(pRenderTarget->CreateRenderTargetBitmap(
                 width,
                 height,
-                format,
-                dpiX,
-                dpiY,
-                DisplayId::None,
-                ppIRenderTargetBitmap
-                DBG_STEP_RENDERING_COMMA_PARAM(NULL) // pDisplayRTParent
-                ));
-        }
-        else
-        {
-            MIL_THR(WGXERR_NOTIMPLEMENTED);
-        }
+                rtUsage,
+                dwFlags,
+                ppIRenderTargetBitmap));
+
+        pRenderTarget->Release();
     }
 
     API_CHECK(hr);

src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hw.h

@@ -107,4 +107,4 @@
 #include "HwShaderEffect.h"
 #include "ShaderAssemblies\Shaders.h"
 
-
+#include "hybridrt.h"

src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hw.vcxproj

@@ -127,6 +127,7 @@
     <ClCompile Include="InteropDeviceBitmap.cpp" />
     <ClCompile Include="swfallback.cpp" />
     <ClCompile Include="Waffler.cpp" />
+    <ClCompile Include="hybridrt.cpp" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalLinkerInputs Include="$(IntermediateOutputPath)hw.res" />

src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hybridrt.cpp

@@ -0,0 +1,175 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+
+//-----------------------------------------------------------------------------
+//
+//
+//  Description:
+//      CHybridSurfaceRenderTarget implementation
+//
+//      This object creates the hybrid render target.
+//      Which means it automatically creates HW or SW based on MilRTInitialization::Flags
+//      and fallback to SW if HW is not available.
+//
+
+#include "precomp.hpp"
+
+//+------------------------------------------------------------------------
+//
+//  Function:  CHybridSurfaceRenderTarget::Create
+//
+//  Synopsis:  1. Create the CD3DDeviceLevel1
+//             2. Check format support
+//             3. Create and initialize the CHybridSurfaceRenderTarget
+//
+//-------------------------------------------------------------------------
+HRESULT 
+CHybridSurfaceRenderTarget::Create(
+    __in_ecount_opt(1) CDisplaySet const *pDisplaySet,
+    MilRTInitialization::Flags dwFlags,
+    FLOAT dpiX, FLOAT dpiY,
+    __deref_out_ecount(1) CHybridSurfaceRenderTarget **ppRenderTarget
+    ) 
+{
+    HRESULT hr = S_OK;
+
+    *ppRenderTarget = NULL;
+
+    CDisplay *pDisplay = NULL;
+    D3DDEVTYPE type = D3DDEVTYPE_SW;
+
+    if (pDisplaySet && pDisplaySet->GetDisplayCount() > 0) 
+    {
+        pDisplay = const_cast<CDisplay *>(pDisplaySet->Display(0));
+        type = D3DDEVTYPE_HAL;
+    }
+
+    CD3DDeviceLevel1 *pD3DDevice = NULL;
+
+    D3DPRESENT_PARAMETERS D3DPresentParams;
+    UINT AdapterOrdinalInGroup;
+
+    CD3DDeviceManager *pD3DDeviceManager = CD3DDeviceManager::Get();
+    Assert(pDisplay->D3DObject()); // we should not get here with null pID3D
+
+    IFC(pD3DDeviceManager->GetD3DDeviceAndPresentParams(
+        NULL,
+        dwFlags,
+        pDisplay,
+        type,
+        &pD3DDevice,
+        &D3DPresentParams,
+        &AdapterOrdinalInGroup
+        ));
+
+    HRESULT const *phrTestGetDC;
+
+    IFC(pD3DDevice->CheckRenderTargetFormat(
+        D3DPresentParams.BackBufferFormat,
+        OUT &phrTestGetDC
+        ));
+
+    {
+        DisplayId associatedDisplay = pDisplay->GetDisplayId();
+
+        *ppRenderTarget = new CHybridSurfaceRenderTarget(
+            pD3DDevice,
+            D3DPresentParams,
+            associatedDisplay,
+            dpiX,
+            dpiY
+            );
+
+        IFCOOM(*ppRenderTarget);
+        (*ppRenderTarget)->AddRef(); // CHybridSurfaceRenderTarget::ctor sets ref count == 0
+    }
+
+Cleanup:
+    if (FAILED(hr))
+    {
+        ReleaseInterface(*ppRenderTarget);
+    }
+    ReleaseInterfaceNoNULL(pD3DDevice);
+    pD3DDeviceManager->Release();
+    RRETURN(hr);
+}
+
+
+//+------------------------------------------------------------------------
+//
+//  Function:  CHybridSurfaceRenderTarget::HrFindInterface
+//
+//  Synopsis:  HrFindInterface implementation
+//
+//-------------------------------------------------------------------------
+STDMETHODIMP
+CHybridSurfaceRenderTarget::HrFindInterface(
+    __in_ecount(1) REFIID riid,
+    __deref_out void** ppvObject
+)
+{
+    AssertMsg(false, "CHybridSurfaceRenderTarget is not allowed to be QI'ed.");
+    RRETURN(E_NOINTERFACE);
+}
+
+//+------------------------------------------------------------------------
+//
+//  Function:  CHwDisplayRenderTarget::CHwDisplayRenderTarget
+//
+//  Synopsis:  ctor
+//
+//-------------------------------------------------------------------------
+CHybridSurfaceRenderTarget::CHybridSurfaceRenderTarget(
+    __inout_ecount(1) CD3DDeviceLevel1 *pD3DDevice,
+    __in_ecount(1) D3DPRESENT_PARAMETERS const &D3DPresentParams,
+    DisplayId associatedDisplay,
+    FLOAT dpiX, FLOAT dpiY
+    ) :
+    CHwSurfaceRenderTarget(
+        pD3DDevice,
+        D3DFormatToPixelFormat(D3DPresentParams.BackBufferFormat, TRUE),
+        D3DPresentParams.BackBufferFormat,
+        associatedDisplay
+    )
+{
+    m_DeviceTransform.Scale(dpiX, dpiY);
+}
+
+//+----------------------------------------------------------------------------
+//
+//  Member:    CHybridSurfaceRenderTarget::IsValid
+//
+//  Synopsis:  Returns FALSE when rendering with this render target or any use
+//             is no longer allowed.  Mode change is a common cause of of
+//             invalidation.
+//
+//-----------------------------------------------------------------------------
+
+bool
+CHybridSurfaceRenderTarget::IsValid() const
+{
+    return true;
+}
+
+
+#if DBG_STEP_RENDERING
+
+//+------------------------------------------------------------------------
+//
+//  Function:  CHwDisplayRenderTarget::ShowSteppedRendering
+//
+//  Synopsis:  Present the current backbuffer or the given texture
+//             when enabled in debug builds
+//
+//-------------------------------------------------------------------------
+
+void
+CHybridSurfaceRenderTarget::ShowSteppedRendering(
+    __in LPCTSTR pszRenderDesc,
+    __in_ecount(1) const ISteppedRenderingSurfaceRT *pRT
+    )
+{ }
+
+#endif DBG_STEP_RENDERING

src/Microsoft.DotNet.Wpf/src/WpfGfx/core/hw/hybridrt.h

@@ -0,0 +1,73 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+MtExtern(CHybridSurfaceRenderTarget);
+
+//------------------------------------------------------------------------------
+//
+//  Class: CHybridSurfaceRenderTarget
+//
+//  Description:
+//      This object creates the hybrid render target.
+//      Which means it automatically creates HW or SW based on MilRTInitialization::Flags
+//      and fallback to SW if HW is not available.
+//
+//------------------------------------------------------------------------------
+class CHybridSurfaceRenderTarget :
+    public CMILCOMBase,
+    public CHwSurfaceRenderTarget
+{
+public:
+
+    static HRESULT Create(
+        __in_ecount(1) CDisplaySet const *pDisplaySet,
+        MilRTInitialization::Flags dwFlags,
+        FLOAT dpiX, FLOAT dpiY,
+        __deref_out_ecount(1) CHybridSurfaceRenderTarget **ppRenderTarget
+        );
+
+    //
+    // IUnknown methods
+    //
+
+    DECLARE_COM_BASE;
+    STDMETHOD(HrFindInterface)(
+        __in_ecount(1) REFIID riid,
+        __deref_out void** ppv
+        );
+
+private:
+
+    CHybridSurfaceRenderTarget(
+        __inout_ecount(1) CD3DDeviceLevel1 *pD3DDevice,
+        __in_ecount(1) D3DPRESENT_PARAMETERS const &D3DPresentParams,
+        DisplayId associatedDisplay,
+        FLOAT dpiX, FLOAT dpiY
+        );
+
+protected:
+
+    //
+    // CHybridSurfaceRenderTarget methods
+    //
+
+    //+------------------------------------------------------------------------
+    //
+    //  Member:    IsValid
+    //
+    //  Synopsis:  Returns FALSE when rendering with this render target or any
+    //             use is no longer allowed.  Mode change is a common cause of
+    //             of invalidation.
+    //
+    //-------------------------------------------------------------------------
+    bool IsValid() const;
+
+#if DBG_STEP_RENDERING
+public:
+    void ShowSteppedRendering(
+        __in LPCTSTR pszRenderDesc,
+        __in_ecount(1) const ISteppedRenderingSurfaceRT *pRT
+        );
+#endif DBG_STEP_RENDERING
+};