More Direct3D12 improvements.

Author: amerkoleci

Source/SharpDX.Direct3D12/Device.cs

@@ -78,12 +78,8 @@ public bool CheckFeatureSupport<T>(SharpDX.Direct3D12.Feature feature, ref T fea
         /// <summary>	
         /// <p>Creates a command queue.</p>	
         /// </summary>	
-        /// <param name="descRef"><dd>  <p> Specifies a <see cref="SharpDX.Direct3D12.CommandQueueDescription"/> that describes the command queue. </p> </dd></param>	
-        /// <param name="riid"><dd>  <p> The globally unique identifier (<see cref="System.Guid"/>) for the command queue interface. See remarks.  An input parameter. </p> </dd></param>	
+        /// <param name="description"><dd>  <p> Specifies a <see cref="SharpDX.Direct3D12.CommandQueueDescription"/> that describes the command queue. </p> </dd></param>	
         /// <returns><dd>  <p> A reference to a memory block that receives a reference to the <strong><see cref="SharpDX.Direct3D12.CommandQueue"/></strong> interface for the command queue. </p> </dd></returns>	
-        /// <remarks>	
-        /// <p> The <strong>REFIID</strong>, or <strong><see cref="System.Guid"/></strong>, of the interface to the command queue can be obtained by using the __uuidof() macro. For example, __uuidof(<see cref="SharpDX.Direct3D12.CommandQueue"/>) will get the <strong><see cref="System.Guid"/></strong> of the interface to a command queue. </p>	
-        /// </remarks>	
         /// <include file='Documentation\CodeComments.xml' path="/comments/comment[@id='ID3D12Device::CreateCommandQueue']/*"/>	
         /// <msdn-id>dn788657</msdn-id>	
         /// <unmanaged>HRESULT ID3D12Device::CreateCommandQueue([In] const D3D12_COMMAND_QUEUE_DESC* pDesc,[In] const GUID&amp; riid,[Out] ID3D12CommandQueue** ppCommandQueue)</unmanaged>	
@@ -93,11 +89,31 @@ public SharpDX.Direct3D12.CommandQueue CreateCommandQueue(SharpDX.Direct3D12.Com
             return CreateCommandQueue(description, Utilities.GetGuidFromType(typeof(CommandQueue)));
         }
 
+        /// <summary>	
+        /// <p>Creates a command queue.</p>	
+        /// </summary>	
+        /// <param name="type">The <see cref="SharpDX.Direct3D12.CommandListType"/> that describes the command queue.</param>
+        /// <returns><dd>  <p> A reference to a memory block that receives a reference to the <strong><see cref="SharpDX.Direct3D12.CommandQueue"/></strong> interface for the command queue. </p> </dd></returns>	
+        public SharpDX.Direct3D12.CommandQueue CreateCommandQueue(SharpDX.Direct3D12.CommandListType type)
+        {
+            return CreateCommandQueue(new SharpDX.Direct3D12.CommandQueueDescription(type), Utilities.GetGuidFromType(typeof(CommandQueue)));
+        }
+
+        /// <summary>	
+        /// <p>Creates a command queue.</p>	
+        /// </summary>	
+        /// <param name="type">The <see cref="SharpDX.Direct3D12.CommandListType"/> that describes the command queue.</param>
+        /// <param name="nodeMask">Multi GPU node mask.</param>
+        /// <returns><dd>  <p> A reference to a memory block that receives a reference to the <strong><see cref="SharpDX.Direct3D12.CommandQueue"/></strong> interface for the command queue. </p> </dd></returns>	
+        public SharpDX.Direct3D12.CommandQueue CreateCommandQueue(SharpDX.Direct3D12.CommandListType type, int nodeMask)
+        {
+            return CreateCommandQueue(new SharpDX.Direct3D12.CommandQueueDescription(type, nodeMask), Utilities.GetGuidFromType(typeof(CommandQueue)));
+        }
+
         /// <summary>	
         /// <p>Creates a command allocator object.</p>	
         /// </summary>	
         /// <param name="type"><dd>  <p> A <strong><see cref="SharpDX.Direct3D12.CommandListType"/></strong>-typed value that specifies the type of command allocator to create. The type of command allocator can be the type that records either direct command lists or bundles. </p> </dd></param>	
-        /// <param name="riid"><dd>  <p> The globally unique identifier (<strong><see cref="System.Guid"/></strong>) for the command allocator interface (<strong><see cref="SharpDX.Direct3D12.CommandAllocator"/></strong>). The <strong>REFIID</strong>, or <strong><see cref="System.Guid"/></strong>, of the interface to the command allocator can be obtained by using the __uuidof() macro. For example, __uuidof(<see cref="SharpDX.Direct3D12.CommandAllocator"/>) will get the <strong><see cref="System.Guid"/></strong> of the interface to a command allocator. </p> </dd></param>	
         /// <returns><dd>  <p> A reference to a memory block that receives a reference to the <strong><see cref="SharpDX.Direct3D12.CommandAllocator"/></strong> interface for the command allocator. </p> </dd></returns>	
         /// <remarks>	
         /// <p> The device creates command lists from the command allocator. </p>	
@@ -148,10 +164,10 @@ public GraphicsCommandList CreateCommandList(int nodeMask,
             SharpDX.Direct3D12.PipelineState initialState)
         {
             var nativePointer = CreateCommandList(
-                nodeMask, 
-                type, 
+                nodeMask,
+                type,
                 commandAllocator,
-                initialState, 
+                initialState,
                 Utilities.GetGuidFromType(typeof(GraphicsCommandList)));
             return new GraphicsCommandList(nativePointer);
         }
@@ -171,9 +187,9 @@ public unsafe CommandSignature CreateCommandSignature(SharpDX.Direct3D12.Command
         {
             var nativeDesc = new CommandSignatureDescription.__Native();
             descRef.__MarshalTo(ref nativeDesc);
-            fixed(void* pIndirectArguments = descRef.IndirectArguments)
+            fixed (void* pIndirectArguments = descRef.IndirectArguments)
             {
-                if(descRef.IndirectArguments != null)
+                if (descRef.IndirectArguments != null)
                 {
                     nativeDesc.ArgumentDescCount = descRef.IndirectArguments.Length;
                     nativeDesc.ArgumentDescsPointer = new IntPtr(pIndirectArguments);
@@ -224,7 +240,7 @@ public unsafe SharpDX.Direct3D12.PipelineState CreateComputePipelineState(SharpD
             {
                 descRef.ComputeShader.UpdateNative(ref nativeDesc.ComputeShader, (IntPtr)pComputeShader);
                 return CreateComputePipelineState(new IntPtr(&nativeDesc), Utilities.GetGuidFromType(typeof(PipelineState)));
-            }       
+            }
         }
 
         /// <summary>	
@@ -366,7 +382,7 @@ public unsafe SharpDX.Direct3D12.PipelineState CreateGraphicsPipelineState(Sharp
                 {
                     var ptr = stackalloc StreamOutputElement.__Native[streamOutElements.Length];
                     nativeStreamOutElements = ptr;
-                    for(int i = 0; i < streamOutElements.Length; i++)
+                    for (int i = 0; i < streamOutElements.Length; i++)
                     {
                         streamOutElements[i].__MarshalTo(ref nativeStreamOutElements[i]);
                     }

Source/SharpDX.Direct3D12/GraphicsCommandList.cs

@@ -340,7 +340,9 @@ public unsafe void SetScissorRectangles(SharpDX.Mathematics.Interop.RawRectangle
         /// <unmanaged-short>ID3D12GraphicsCommandList::BeginEvent</unmanaged-short>	
         public void BeginEvent(string name)
         {
-            if (name == null) throw new ArgumentNullException("name");
+            if (name == null)
+                throw new ArgumentNullException(nameof(name));
+
             IntPtr hMessage = IntPtr.Zero;
             try
             {
@@ -383,5 +385,39 @@ public void SetMarker(string name)
                 }
             }
         }
+
+        /// <summary>	
+        /// <p> Apps perform indirect draws/dispatches using the <strong>ExecuteIndirect</strong> method. </p>	
+        /// </summary>	
+        /// <param name="commandSignature"><dd>  <p> Specifies a <strong><see cref="SharpDX.Direct3D12.CommandSignature"/></strong>. The data referenced by <em>pArgumentBuffer</em> will be interpreted depending on the contents of the command signature. Refer to Indirect Drawing for the APIs that are used to create a command signature. </p> </dd></param>	
+        /// <param name="maxCommandCount"><dd>  <p>There are two ways that command counts can be specified:</p> <ul> <li> If <em>pCountBuffer</em> is not <c>null</c>, then <em>MaxCommandCount</em> specifies the maximum number of operations which will be performed.  The actual number of operations to be performed are defined by the minimum of this value, and a 32-bit unsigned integer contained in <em>pCountBuffer</em> (at the byte offset specified by <em>CountBufferOffset</em>). </li> <li> If <em>pCountBuffer</em> is <c>null</c>, the <em>MaxCommandCount</em> specifies the exact number of operations which will be performed. </li> </ul> </dd></param>	
+        /// <param name="argumentBuffer"><dd>  <p> Specifies one or more <strong><see cref="SharpDX.Direct3D12.Resource"/></strong> objects, containing the command arguments. </p> </dd></param>	
+        /// <param name="argumentBufferOffset"><dd>  <p> Specifies an offset into <em>pArgumentBuffer</em> to identify the first command argument. </p> </dd></param>	
+        /// <remarks>	
+        /// <p>The semantics of this API are defined with the following pseudo-code:</p><p>Non-<c>null</c> pCountBuffer:</p><code>// Read draw count out of count buffer	
+        /// UINT CommandCount = pCountBuffer-&gt;ReadUINT32(CountBufferOffset); CommandCount = min(CommandCount, MaxCommandCount) // Get reference to first Commanding argument	
+        /// BYTE* Arguments = pArgumentBuffer-&gt;GetBase() + ArgumentBufferOffset; for(UINT CommandIndex = 0; CommandIndex &lt; CommandCount; CommandIndex++)	
+        /// { // Interpret the data contained in *Arguments // according to the command signature pCommandSignature-&gt;Interpret(Arguments); Arguments += pCommandSignature -&gt;GetByteStride();	
+        /// }	
+        /// </code><p><c>null</c> pCountBuffer:</p><code>// Get reference to first Commanding argument	
+        /// BYTE* Arguments = pArgumentBuffer-&gt;GetBase() + ArgumentBufferOffset; for(UINT CommandIndex = 0; CommandIndex &lt; MaxCommandCount; CommandIndex++)	
+        /// { // Interpret the data contained in *Arguments // according to the command signature pCommandSignature-&gt;Interpret(Arguments); Arguments += pCommandSignature -&gt;GetByteStride();	
+        /// }	
+        /// </code><p>The debug layer will issue an error if either the count buffer or the argument buffer are not in the <see cref="SharpDX.Direct3D12.ResourceStates.IndirectArgument"/> state. The core runtime will validate:</p><ul> <li><em>CountBufferOffset</em> and <em>ArgumentBufferOffset</em> are 4-byte aligned </li> <li><em>pCountBuffer</em> and <em>pArgumentBuffer</em> are buffer resources (any heap type) </li> <li> The offset implied by <em>MaxCommandCount</em>, <em>ArgumentBufferOffset</em>, and the drawing program stride do not exceed the bounds of <em>pArgumentBuffer</em> (similarly for count buffer) </li> <li>The command list is a direct command list or a compute command list (not a copy or JPEG decode command list)</li> <li>The root signature of the command list matches the root signature of the command signature</li> </ul><p> The functionality of two APIs from earlier versions of Direct3D, <code>DrawInstancedIndirect</code> and <code>DrawIndexedInstancedIndirect</code>, are encompassed by  <strong>ExecuteIndirect</strong>. </p>	
+        /// </remarks>	
+        public void ExecuteIndirect(
+            SharpDX.Direct3D12.CommandSignature commandSignature, 
+            int maxCommandCount, 
+            SharpDX.Direct3D12.Resource argumentBuffer, 
+            long argumentBufferOffset)
+        {
+            ExecuteIndirect(
+                commandSignature, 
+                maxCommandCount,
+                argumentBuffer, 
+                argumentBufferOffset, 
+                null, 
+                0);
+        }
     }
 }

Source/SharpDX.Direct3D12/Mapping.xml

@@ -238,7 +238,10 @@
     <map method="ID3D12GraphicsCommandList::IASetIndexBuffer" property="false"/>
 
     <map method="ID3D12Device::RegisterBudgetChangeCallback" visibility="internal"/>
-
+    <map method="ID3D12GraphicsCommandList::BeginEvent" visibility="internal" />
+    
+    <map method="ID3D12GraphicsCommandList1::OMSetDepthBounds" visibility="private" />
+    
     <!--Revert changes inherited from D3D11. Leave all Device.CreateXXX method as-is-->
     <map method="ID3D12Device::CreateCommandAllocator" visibility="public"/>
     <map param="ID3D12Device::CreateCommandAllocator::ppCommandAllocator" attribute="out" return="true"/>