Implement proxied MSAA texture contents on D3D11

2026-09-21 05:05:44 +00:00 · 2018-08-01 17:29:36 +01:00
parent 0b6f735ad2
commit 9c1b7f1d79
4 changed files with 104 additions and 36 deletions
@@ -102,7 +102,7 @@ public:
  uint32_t GetStructCount(ID3D11UnorderedAccessView *uav);
  void GetBufferData(ID3D11Buffer *buff, uint64_t offset, uint64_t length, bytebuf &retData);

-  void CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Texture2D *srcArray);
+  void CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Texture2D *srcArray, UINT selectedSlice);
  void CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Texture2D *srcMS);

  ID3D11Buffer *MakeCBuffer(const void *data, size_t size);
@@ -815,7 +815,7 @@ bool WrappedID3D11Device::Serialise_InitialState(SerialiserType &ser, ResourceId
            ID3D11Texture2D *contentsMS = NULL;
            hr = m_pDevice->CreateTexture2D(&desc, NULL, &contentsMS);

-            m_DebugManager->CopyArrayToTex2DMS(contentsMS, dataTex);
+            m_DebugManager->CopyArrayToTex2DMS(contentsMS, dataTex, ~0U);

            SAFE_RELEASE(dataTex);
            dataTex = contentsMS;
@@ -168,8 +168,11 @@ struct Tex2DMSToArrayStateTracker
  } OM;
 };

-void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Texture2D *srcArray)
+void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Texture2D *srcArray,
+                                           UINT selectedSlice)
 {
+  bool singleSliceMode = (selectedSlice != ~0U);
+
  // unlike CopyTex2DMSToArray we can use the wrapped context here, but for consistency
  // we accept unwrapped parameters.

@@ -182,7 +185,16 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  D3D11_TEXTURE2D_DESC descMS;
  destMS->GetDesc(&descMS);

-  bool depth = IsDepthFormat(descMS.Format);
+  UINT sampleMask = ~0U;
+
+  if(singleSliceMode)
+  {
+    sampleMask = 1U << (selectedSlice % descMS.SampleDesc.Count);
+    selectedSlice /= descMS.SampleDesc.Count;
+  }
+
+  bool depthFormat = IsDepthFormat(descMS.Format);
+  bool intFormat = IsUIntFormat(descMS.Format) || IsIntFormat(descMS.Format);

  ID3D11Texture2D *rtvResource = NULL;
  ID3D11Texture2D *srvResource = NULL;
@@ -190,10 +202,10 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  D3D11_TEXTURE2D_DESC rtvResDesc = descMS;
  D3D11_TEXTURE2D_DESC srvResDesc = descArr;

-  rtvResDesc.BindFlags = depth ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_RENDER_TARGET;
+  rtvResDesc.BindFlags = depthFormat ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_RENDER_TARGET;
  srvResDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;

-  if(depth)
+  if(depthFormat)
  {
    rtvResDesc.Format = GetTypelessFormat(rtvResDesc.Format);
    srvResDesc.Format = GetTypelessFormat(srvResDesc.Format);
@@ -221,6 +233,11 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
    return;
  }

+  // if we're doing a partial update, need to preserve what was in the destination texture
+  if(singleSliceMode)
+    m_pImmediateContext->GetReal()->CopyResource(UNWRAP(WrappedID3D11Texture2D1, rtvResource),
+                                                 destMS);
+
  m_pImmediateContext->GetReal()->CopyResource(UNWRAP(WrappedID3D11Texture2D1, srvResource),
                                               srcArray);

@@ -233,7 +250,13 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  m_pImmediateContext->CSSetUnorderedAccessViews(0, numUAVs, uavs, uavCounts);

  m_pImmediateContext->VSSetShader(MSArrayCopyVS, NULL, 0);
-  m_pImmediateContext->PSSetShader(depth ? DepthCopyArrayToMSPS : CopyArrayToMSPS, NULL, 0);
+
+  if(depthFormat)
+    m_pImmediateContext->PSSetShader(DepthCopyArrayToMSPS, NULL, 0);
+  else if(intFormat)
+    m_pImmediateContext->PSSetShader(CopyArrayToMSPS, NULL, 0);
+  else
+    m_pImmediateContext->PSSetShader(FloatCopyArrayToMSPS, NULL, 0);

  m_pImmediateContext->HSSetShader(NULL, NULL, 0);
  m_pImmediateContext->DSSetShader(NULL, NULL, 0);
@@ -247,7 +270,7 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  m_pImmediateContext->IASetInputLayout(NULL);
  m_pImmediateContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
  float blendFactor[] = {1.0f, 1.0f, 1.0f, 1.0f};
-  m_pImmediateContext->OMSetBlendState(NULL, blendFactor, ~0U);
+  m_pImmediateContext->OMSetBlendState(NULL, blendFactor, sampleMask);

  {
    D3D11_DEPTH_STENCIL_DESC dsDesc;
@@ -257,7 +280,7 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
    dsDesc.DepthEnable = TRUE;
    dsDesc.DepthFunc = D3D11_COMPARISON_ALWAYS;
    dsDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-    if(depth)
+    if(depthFormat)
      dsDesc.StencilEnable = FALSE;
    else
      dsDesc.StencilEnable = TRUE;
@@ -281,8 +304,8 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur

  D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
  rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
-  rtvDesc.Format =
-      depth ? GetUIntTypedFormat(descMS.Format) : GetTypedFormat(descMS.Format, CompType::UInt);
+  rtvDesc.Format = depthFormat ? GetUIntTypedFormat(descMS.Format)
+                               : GetTypedFormat(descMS.Format, CompType::UInt);
  rtvDesc.Texture2DMSArray.ArraySize = descMS.ArraySize;
  rtvDesc.Texture2DMSArray.FirstArraySlice = 0;

@@ -295,8 +318,8 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur

  D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
  srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-  srvDesc.Format =
-      depth ? GetUIntTypedFormat(descArr.Format) : GetTypedFormat(descArr.Format, CompType::UInt);
+  srvDesc.Format = depthFormat ? GetUIntTypedFormat(descArr.Format)
+                               : GetTypedFormat(descArr.Format, CompType::UInt);
  srvDesc.Texture2DArray.ArraySize = descArr.ArraySize;
  srvDesc.Texture2DArray.FirstArraySlice = 0;
  srvDesc.Texture2DArray.MipLevels = descArr.MipLevels;
@@ -305,7 +328,7 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  bool stencil = false;
  DXGI_FORMAT stencilFormat = DXGI_FORMAT_UNKNOWN;

-  if(depth)
+  if(depthFormat)
  {
    switch(descArr.Format)
    {
@@ -351,6 +374,9 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
  // loop over every array slice in MS texture
  for(UINT slice = 0; slice < descMS.ArraySize; slice++)
  {
+    if(singleSliceMode)
+      slice = selectedSlice;
+
    uint32_t cdata[4] = {descMS.SampleDesc.Count, 1000, 0, slice};

    ID3D11Buffer *cbuf = MakeCBuffer(cdata, sizeof(cdata));
@@ -362,7 +388,7 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
    dsvDesc.Texture2DMSArray.FirstArraySlice = slice;
    dsvDesc.Texture2DMSArray.ArraySize = 1;

-    if(depth)
+    if(depthFormat)
      hr = m_pDevice->CreateDepthStencilView(rtvResource, &dsvDesc, &dsvMS);
    else
      hr = m_pDevice->CreateRenderTargetView(rtvResource, &rtvDesc, &rtvMS);
@@ -373,7 +399,7 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
      return;
    }

-    if(depth)
+    if(depthFormat)
      m_pImmediateContext->OMSetRenderTargetsAndUnorderedAccessViews(0, NULL, dsvMS, 0, 0, NULL,
                                                                     NULL);
    else
@@ -384,6 +410,9 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur

    SAFE_RELEASE(rtvMS);
    SAFE_RELEASE(dsvMS);
+
+    if(singleSliceMode)
+      break;
  }

  SAFE_RELEASE(srvArray);
@@ -426,6 +455,9 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
    // loop over every array slice in MS texture
    for(UINT slice = 0; slice < descMS.ArraySize; slice++)
    {
+      if(singleSliceMode)
+        slice = selectedSlice;
+
      dsvDesc.Texture2DMSArray.FirstArraySlice = slice;

      hr = m_pDevice->CreateDepthStencilView(rtvResource, &dsvDesc, &dsvMS);
@@ -455,6 +487,9 @@ void D3D11DebugManager::CopyArrayToTex2DMS(ID3D11Texture2D *destMS, ID3D11Textur
      }

      SAFE_RELEASE(dsvMS);
+
+      if(singleSliceMode)
+        break;
    }

    SAFE_RELEASE(srvArray);
@@ -493,12 +528,13 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex
  D3D11_TEXTURE2D_DESC rtvResDesc = descArr;
  D3D11_TEXTURE2D_DESC srvResDesc = descMS;

-  bool depth = IsDepthFormat(descMS.Format);
+  bool depthFormat = IsDepthFormat(descMS.Format);
+  bool intFormat = IsUIntFormat(descMS.Format) || IsIntFormat(descMS.Format);

-  rtvResDesc.BindFlags = depth ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_RENDER_TARGET;
+  rtvResDesc.BindFlags = depthFormat ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_RENDER_TARGET;
  srvResDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;

-  if(depth)
+  if(depthFormat)
  {
    rtvResDesc.Format = GetTypelessFormat(rtvResDesc.Format);
    srvResDesc.Format = GetTypelessFormat(srvResDesc.Format);
@@ -537,9 +573,12 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex
  ctx->CSSetUnorderedAccessViews(0, numUAVs, uavs, uavCounts);

  ctx->VSSetShader(UNWRAP(WrappedID3D11Shader<ID3D11VertexShader>, MSArrayCopyVS), NULL, 0);
-  ctx->PSSetShader(depth ? UNWRAP(WrappedID3D11Shader<ID3D11PixelShader>, DepthCopyMSToArrayPS)
-                         : UNWRAP(WrappedID3D11Shader<ID3D11PixelShader>, CopyMSToArrayPS),
-                   NULL, 0);
+  if(depthFormat)
+    ctx->PSSetShader(UNWRAP(WrappedID3D11Shader<ID3D11PixelShader>, DepthCopyMSToArrayPS), NULL, 0);
+  else if(intFormat)
+    ctx->PSSetShader(UNWRAP(WrappedID3D11Shader<ID3D11PixelShader>, CopyMSToArrayPS), NULL, 0);
+  else
+    ctx->PSSetShader(UNWRAP(WrappedID3D11Shader<ID3D11PixelShader>, FloatCopyMSToArrayPS), NULL, 0);

  D3D11_VIEWPORT view = {0.0f, 0.0f, (float)descArr.Width, (float)descArr.Height, 0.0f, 1.0f};

@@ -558,7 +597,7 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex
    dsDesc.DepthEnable = TRUE;
    dsDesc.DepthFunc = D3D11_COMPARISON_ALWAYS;
    dsDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
-    if(depth)
+    if(depthFormat)
      dsDesc.StencilEnable = FALSE;
    else
      dsDesc.StencilEnable = TRUE;
@@ -582,8 +621,8 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex

  D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
  rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
-  rtvDesc.Format =
-      depth ? GetUIntTypedFormat(descArr.Format) : GetTypedFormat(descArr.Format, CompType::UInt);
+  rtvDesc.Format = depthFormat ? GetUIntTypedFormat(descArr.Format)
+                               : GetTypedFormat(descArr.Format, CompType::UInt);
  rtvDesc.Texture2DArray.FirstArraySlice = 0;
  rtvDesc.Texture2DArray.ArraySize = 1;
  rtvDesc.Texture2DArray.MipSlice = 0;
@@ -598,15 +637,15 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex

  D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
  srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
-  srvDesc.Format =
-      depth ? GetUIntTypedFormat(descMS.Format) : GetTypedFormat(descMS.Format, CompType::UInt);
+  srvDesc.Format = depthFormat ? GetUIntTypedFormat(descMS.Format)
+                               : GetTypedFormat(descMS.Format, CompType::UInt);
  srvDesc.Texture2DMSArray.ArraySize = descMS.ArraySize;
  srvDesc.Texture2DMSArray.FirstArraySlice = 0;

  bool stencil = false;
  DXGI_FORMAT stencilFormat = DXGI_FORMAT_UNKNOWN;

-  if(depth)
+  if(depthFormat)
  {
    switch(descMS.Format)
    {
@@ -671,7 +710,7 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex
      rtvDesc.Texture2DArray.FirstArraySlice = slice * descMS.SampleDesc.Count + sample;
      dsvDesc.Texture2DArray.FirstArraySlice = slice * descMS.SampleDesc.Count + sample;

-      if(depth)
+      if(depthFormat)
        hr = dev->CreateDepthStencilView(rtvResource, &dsvDesc, &dsvArray);
      else
        hr = dev->CreateRenderTargetView(rtvResource, &rtvDesc, &rtvArray);
@@ -684,7 +723,7 @@ void D3D11DebugManager::CopyTex2DMSToArray(ID3D11Texture2D *destArray, ID3D11Tex
        return;
      }

-      if(depth)
+      if(depthFormat)
        ctx->OMSetRenderTargetsAndUnorderedAccessViews(0, NULL, dsvArray, 0, 0, NULL, NULL);
      else
        ctx->OMSetRenderTargetsAndUnorderedAccessViews(1, &rtvArray, NULL, 0, 0, NULL, NULL);
@@ -3325,23 +3325,52 @@ void D3D11Replay::SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint3

    uint32_t mips = desc.MipLevels ? desc.MipLevels : CalcNumMips(desc.Width, desc.Height, 1);

-    if(mip >= mips || arrayIdx >= desc.ArraySize)
+    UINT sampleCount = RDCMAX(1U, desc.SampleDesc.Count);
+
+    if(mip >= mips || arrayIdx >= desc.ArraySize * sampleCount)
    {
      RDCERR("arrayIdx %d and mip %d invalid for tex", arrayIdx, mip);
      return;
    }

-    uint32_t sub = arrayIdx * mips + mip;
-
    if(dataSize < GetByteSize(desc.Width, desc.Height, 1, desc.Format, mip))
    {
      RDCERR("Insufficient data provided to SetProxyTextureData");
      return;
    }

-    ctx->UpdateSubresource(tex->GetReal(), sub, NULL, data,
-                           GetByteSize(desc.Width, 1, 1, desc.Format, mip),
-                           GetByteSize(desc.Width, desc.Height, 1, desc.Format, mip));
+    if(sampleCount > 1)
+    {
+      D3D11_TEXTURE2D_DESC uploadDesc = desc;
+      uploadDesc.MiscFlags = 0;
+      uploadDesc.CPUAccessFlags = 0;
+      uploadDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+      uploadDesc.Usage = D3D11_USAGE_DEFAULT;
+      uploadDesc.SampleDesc.Count = 1;
+      uploadDesc.SampleDesc.Quality = 0;
+      uploadDesc.ArraySize *= desc.SampleDesc.Count;
+
+      // create an unwrapped texture to upload the data into a slice of
+      ID3D11Texture2D *uploadTex = NULL;
+      m_pDevice->GetReal()->CreateTexture2D(&uploadDesc, NULL, &uploadTex);
+
+      ctx->UpdateSubresource(uploadTex, arrayIdx, NULL, data,
+                             GetByteSize(desc.Width, 1, 1, desc.Format, mip),
+                             GetByteSize(desc.Width, desc.Height, 1, desc.Format, mip));
+
+      // copy that slice into MSAA sample
+      GetDebugManager()->CopyArrayToTex2DMS(tex->GetReal(), uploadTex, arrayIdx);
+
+      uploadTex->Release();
+    }
+    else
+    {
+      uint32_t sub = arrayIdx * mips + mip;
+
+      ctx->UpdateSubresource(tex->GetReal(), sub, NULL, data,
+                             GetByteSize(desc.Width, 1, 1, desc.Format, mip),
+                             GetByteSize(desc.Width, desc.Height, 1, desc.Format, mip));
+    }
  }
  else if(WrappedID3D11Texture3D1::m_TextureList.find(texid) !=
          WrappedID3D11Texture3D1::m_TextureList.end())