D3D12 implementation, part 3

src/d3d12/d3d12_buffer.cpp

@@ -19,6 +19,7 @@
 #include "d3d12_device.hpp"
 #include "d3d12_pageable.hpp"
 #include "com/com_pointer.hpp"
+#include "dxmt_format.hpp"
 
 namespace dxmt {
 
@@ -53,7 +54,8 @@ class MTLD3D12Buffer : public MTLD3D12Pageable<MTLD3D12Resource> {
   };
 
   ~MTLD3D12Buffer() {
-    device_->UnregisterResidencyAndVA(buffer->current());
+    if (buffer)
+      device_->UnregisterResidencyAndVA(buffer->current());
   }
 
   HRESULT
@@ -138,8 +140,40 @@ class MTLD3D12Buffer : public MTLD3D12Pageable<MTLD3D12Resource> {
   CreateUnorderedAccessView(
       ID3D12Resource *pCounter, const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, D3D12_CPU_DESCRIPTOR_HANDLE Descriptor
   ) {
-    IMPLEMENT_ME
-    return S_OK;
+    HRESULT hr;
+    D3D12_UNORDERED_ACCESS_VIEW_DESC ViewDesc;
+    if (!pDesc) {
+      hr = ExtractEntireResourceViewDescription(desc_, &ViewDesc);
+      if (FAILED(hr))
+        return hr;
+    } else {
+      ViewDesc = *pDesc;
+    }
+
+    if (ViewDesc.ViewDimension != D3D12_UAV_DIMENSION_BUFFER)
+      return E_INVALIDARG;
+
+    auto [Heap, Index] = GetShaderVisibleDescriptorHeap(device_, Descriptor);
+    BufferSlice Slice;
+
+    if (ViewDesc.Format == DXGI_FORMAT_UNKNOWN || ViewDesc.Buffer.Flags & D3D12_BUFFER_UAV_FLAG_RAW) {
+      // TODO(d3d12): structured/raw buffer view
+      IMPLEMENT_ME
+    }
+
+    MTL_DXGI_FORMAT_DESC Format;
+    if (FAILED(MTLQueryDXGIFormat(device_->GetMTLDevice(), ViewDesc.Format, Format))) {
+      ERR("D3D12Buffer::CreateUnorderedAccessView: not an ordinary or packed format: ", ViewDesc.Format);
+      return E_FAIL;
+    }
+    BufferViewDescriptor view_descriptor{Format.PixelFormat};
+    Slice.firstElement = ViewDesc.Buffer.FirstElement;
+    Slice.elementCount = ViewDesc.Buffer.NumElements;
+    Slice.byteOffset = Format.BytesPerTexel * ViewDesc.Buffer.FirstElement;
+    Slice.byteLength = Format.BytesPerTexel * ViewDesc.Buffer.NumElements;
+
+    auto view = buffer->createView(view_descriptor);
+    return Heap->AddUnorderedAccessView(Index, buffer.ptr(), view, Slice);
   };
 
   virtual HRESULT STDMETHODCALLTYPE
@@ -168,7 +202,6 @@ CreateCommittedBuffer(
     const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, const D3D12_CLEAR_VALUE *OptimizedClearValue,
     REFIID riid, void **ppResource
 ) {
-  InitReturnPtr(ppResource);
   auto buffer = Com(new MTLD3D12Buffer(pDevice));
   HRESULT hr = buffer->Initialize(pHeapProps, HeapFlags, pDesc, OptimizedClearValue, nullptr);
   if (FAILED(hr))
@@ -183,7 +216,6 @@ CreatePlacedBuffer(
     MTLD3D12Device *pDevice, MTLD3D12Heap *pHeap, const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState,
     const D3D12_CLEAR_VALUE *OptimizedClearValue, REFIID riid, void **ppResource
 ) {
-  InitReturnPtr(ppResource);
   auto buffer = Com(new MTLD3D12Buffer(pDevice));
   D3D12_HEAP_DESC heap_desc = pHeap->GetDesc();
   HRESULT hr = buffer->Initialize(&heap_desc.Properties, heap_desc.Flags, pDesc, OptimizedClearValue, pHeap);

src/d3d12/d3d12_command_allocator.cpp

@@ -118,6 +118,9 @@ MTLD3D12CommandAllocatorImpl::Reset() {
       case EncoderType::Blit:
         reinterpret_cast<BlitEncoderData *>(next)->~BlitEncoderData();
         break;
+      case EncoderType::Compute:
+        reinterpret_cast<ComputeEncoderData *>(next)->~ComputeEncoderData();
+        break;
       }
       next = next->next;
     }

src/d3d12/d3d12_command_allocator.hpp

@@ -159,6 +159,18 @@ class MTLD3D12CommandAllocatorImpl : public MTLD3D12Pageable<MTLD3D12CommandAllo
     return *storage;
   }
 
+  template <typename cmd_struct>
+  cmd_struct &
+  EncodeComputeCommand() {
+    assert(encoder_current->type == EncoderType::Compute);
+    auto encoder = static_cast<ComputeEncoderData *>(encoder_current);
+    auto storage = (cmd_struct *)AllocateCPUHeap(sizeof(cmd_struct), 16);
+    encoder->cmd_tail->next.set(storage);
+    encoder->cmd_tail = (wmtcmd_base *)storage;
+    storage->next.set(nullptr);
+    return *storage;
+  }
+
   std::tuple<void *, size_t>
   AllocateGPUHeap(size_t Length, size_t Alignment) {
     if (!Length)

src/d3d12/d3d12_command_encoder.hpp

@@ -28,6 +28,7 @@ enum class EncoderType {
   Clear,
   Render,
   Blit,
+  Compute,
 };
 
 struct EncoderData {
@@ -107,4 +108,9 @@ struct BlitEncoderData : EncoderData {
   wmtcmd_base *cmd_tail;
 };
 
+struct ComputeEncoderData : EncoderData {
+  wmtcmd_compute_nop cmd_head;
+  wmtcmd_base *cmd_tail;
+};
+
 }; // namespace dxmt