From bd3c4b81fb05fa6d046e3ee8901cdd683661bea5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 5 Oct 2014 16:58:32 +0100 Subject: [PATCH] [Refs #87: Static Analysis] Remove annotations that aren't accurate * The problem with these annotations is they're duplicated for the Serialise_* functions, which the annotations do not apply to. The easiest solution is just to remove the annotations entirely --- renderdoc/driver/d3d11/d3d11_context.h | 1213 ++++++------------ renderdoc/driver/d3d11/d3d11_device.h | 401 ++---- renderdoc/driver/d3d11/d3d11_device_wrap.cpp | 566 +++----- 3 files changed, 748 insertions(+), 1432 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_context.h b/renderdoc/driver/d3d11/d3d11_context.h index dfe6dff5d..27bceb904 100644 --- a/renderdoc/driver/d3d11/d3d11_context.h +++ b/renderdoc/driver/d3d11/d3d11_context.h @@ -285,816 +285,529 @@ public: // implement IDXGIDeviceChild virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [in] */ REFGUID Name, - /* [in] */ UINT DataSize, - /* [in] */ const void *pData) + REFGUID Name, + UINT DataSize, + const void *pData) { return m_pRealContext->SetPrivateData(Name, DataSize, pData); } virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [in] */ REFGUID Name, - /* [in] */ const IUnknown *pUnknown) + REFGUID Name, + const IUnknown *pUnknown) { return m_pRealContext->SetPrivateDataInterface(Name, pUnknown); } virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [in] */ REFGUID Name, - /* [out][in] */ UINT *pDataSize, - /* [out] */ void *pData) + REFGUID Name, + UINT *pDataSize, + void *pData) { return m_pRealContext->GetPrivateData(Name, pDataSize, pData); } virtual void STDMETHODCALLTYPE GetDevice( - /* [retval][out] */ ID3D11Device **ppDevice) + ID3D11Device **ppDevice) { *ppDevice = (ID3D11Device *)m_pDevice; (*ppDevice)->AddRef(); } ////////////////////////////// // implement ID3D11DeviceContext IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetShader( - /* [annotation] */ - __in_opt ID3D11PixelShader *pPixelShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11PixelShader *pPixelShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetShader( - /* [annotation] */ - __in_opt ID3D11VertexShader *pVertexShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11VertexShader *pVertexShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawIndexed( - /* [annotation] */ - __in UINT IndexCount, - /* [annotation] */ - __in UINT StartIndexLocation, - /* [annotation] */ - __in INT BaseVertexLocation)); + UINT IndexCount, + UINT StartIndexLocation, + INT BaseVertexLocation)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, Draw( - /* [annotation] */ - __in UINT VertexCount, - /* [annotation] */ - __in UINT StartVertexLocation)); + UINT VertexCount, + UINT StartVertexLocation)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, Map( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in UINT Subresource, - /* [annotation] */ - __in D3D11_MAP MapType, - /* [annotation] */ - __in UINT MapFlags, - /* [annotation] */ - __out D3D11_MAPPED_SUBRESOURCE *pMappedResource)); + ID3D11Resource *pResource, + UINT Subresource, + D3D11_MAP MapType, + UINT MapFlags, + D3D11_MAPPED_SUBRESOURCE *pMappedResource)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, Unmap( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in UINT Subresource)); + ID3D11Resource *pResource, + UINT Subresource)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IASetInputLayout( - /* [annotation] */ - __in_opt ID3D11InputLayout *pInputLayout)); + ID3D11InputLayout *pInputLayout)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IASetVertexBuffers( - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) const UINT *pStrides, - /* [annotation] */ - __in_ecount(NumBuffers) const UINT *pOffsets)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppVertexBuffers, + const UINT *pStrides, + const UINT *pOffsets)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IASetIndexBuffer( - /* [annotation] */ - __in_opt ID3D11Buffer *pIndexBuffer, - /* [annotation] */ - __in DXGI_FORMAT Format, - /* [annotation] */ - __in UINT Offset)); + ID3D11Buffer *pIndexBuffer, + DXGI_FORMAT Format, + UINT Offset)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawIndexedInstanced( - /* [annotation] */ - __in UINT IndexCountPerInstance, - /* [annotation] */ - __in UINT InstanceCount, - /* [annotation] */ - __in UINT StartIndexLocation, - /* [annotation] */ - __in INT BaseVertexLocation, - /* [annotation] */ - __in UINT StartInstanceLocation)); + UINT IndexCountPerInstance, + UINT InstanceCount, + UINT StartIndexLocation, + INT BaseVertexLocation, + UINT StartInstanceLocation)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawInstanced( - /* [annotation] */ - __in UINT VertexCountPerInstance, - /* [annotation] */ - __in UINT InstanceCount, - /* [annotation] */ - __in UINT StartVertexLocation, - /* [annotation] */ - __in UINT StartInstanceLocation)); + UINT VertexCountPerInstance, + UINT InstanceCount, + UINT StartVertexLocation, + UINT StartInstanceLocation)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetShader( - /* [annotation] */ - __in_opt ID3D11GeometryShader *pShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11GeometryShader *pShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IASetPrimitiveTopology( - /* [annotation] */ - __in D3D11_PRIMITIVE_TOPOLOGY Topology)); + D3D11_PRIMITIVE_TOPOLOGY Topology)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, Begin( - /* [annotation] */ - __in ID3D11Asynchronous *pAsync)); + ID3D11Asynchronous *pAsync)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, End( - /* [annotation] */ - __in ID3D11Asynchronous *pAsync)); + ID3D11Asynchronous *pAsync)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, GetData( - /* [annotation] */ - __in ID3D11Asynchronous *pAsync, - /* [annotation] */ - __out_bcount_opt( DataSize ) void *pData, - /* [annotation] */ - __in UINT DataSize, - /* [annotation] */ - __in UINT GetDataFlags)); + ID3D11Asynchronous *pAsync, + void *pData, + UINT DataSize, + UINT GetDataFlags)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SetPredication( - /* [annotation] */ - __in_opt ID3D11Predicate *pPredicate, - /* [annotation] */ - __in BOOL PredicateValue)); + ID3D11Predicate *pPredicate, + BOOL PredicateValue)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMSetRenderTargets( - /* [annotation] */ - __in_range( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ - __in_ecount_opt(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ - __in_opt ID3D11DepthStencilView *pDepthStencilView)); + UINT NumViews, + ID3D11RenderTargetView *const *ppRenderTargetViews, + ID3D11DepthStencilView *pDepthStencilView)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMSetRenderTargetsAndUnorderedAccessViews( - /* [annotation] */ - __in UINT NumRTVs, - /* [annotation] */ - __in_ecount_opt(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ - __in_opt ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ - __in UINT NumUAVs, - /* [annotation] */ - __in_ecount_opt(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ - __in_ecount_opt(NumUAVs) const UINT *pUAVInitialCounts)); + UINT NumRTVs, + ID3D11RenderTargetView *const *ppRenderTargetViews, + ID3D11DepthStencilView *pDepthStencilView, + UINT UAVStartSlot, + UINT NumUAVs, + ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, + const UINT *pUAVInitialCounts)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMSetBlendState( - /* [annotation] */ - __in_opt ID3D11BlendState *pBlendState, - /* [annotation] */ - __in_opt const FLOAT BlendFactor[ 4 ], - /* [annotation] */ - __in UINT SampleMask)); + ID3D11BlendState *pBlendState, + const FLOAT BlendFactor[ 4 ], + UINT SampleMask)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMSetDepthStencilState( - /* [annotation] */ - __in_opt ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ - __in UINT StencilRef)); + ID3D11DepthStencilState *pDepthStencilState, + UINT StencilRef)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SOSetTargets( - /* [annotation] */ - __in_range( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ - __in_ecount_opt(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ - __in_ecount_opt(NumBuffers) const UINT *pOffsets)); + UINT NumBuffers, + ID3D11Buffer *const *ppSOTargets, + const UINT *pOffsets)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawAuto( void)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawIndexedInstancedIndirect( - /* [annotation] */ - __in ID3D11Buffer *pBufferForArgs, - /* [annotation] */ - __in UINT AlignedByteOffsetForArgs)); + ID3D11Buffer *pBufferForArgs, + UINT AlignedByteOffsetForArgs)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DrawInstancedIndirect( - /* [annotation] */ - __in ID3D11Buffer *pBufferForArgs, - /* [annotation] */ - __in UINT AlignedByteOffsetForArgs)); + ID3D11Buffer *pBufferForArgs, + UINT AlignedByteOffsetForArgs)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, Dispatch( - /* [annotation] */ - __in UINT ThreadGroupCountX, - /* [annotation] */ - __in UINT ThreadGroupCountY, - /* [annotation] */ - __in UINT ThreadGroupCountZ)); + UINT ThreadGroupCountX, + UINT ThreadGroupCountY, + UINT ThreadGroupCountZ)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DispatchIndirect( - /* [annotation] */ - __in ID3D11Buffer *pBufferForArgs, - /* [annotation] */ - __in UINT AlignedByteOffsetForArgs)); + ID3D11Buffer *pBufferForArgs, + UINT AlignedByteOffsetForArgs)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSSetState( - /* [annotation] */ - __in_opt ID3D11RasterizerState *pRasterizerState)); + ID3D11RasterizerState *pRasterizerState)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSSetViewports( - /* [annotation] */ - __in_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ - __in_ecount_opt(NumViewports) const D3D11_VIEWPORT *pViewports)); + UINT NumViewports, + const D3D11_VIEWPORT *pViewports)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSSetScissorRects( - /* [annotation] */ - __in_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ - __in_ecount_opt(NumRects) const D3D11_RECT *pRects)); + UINT NumRects, + const D3D11_RECT *pRects)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CopySubresourceRegion( - /* [annotation] */ - __in ID3D11Resource *pDstResource, - /* [annotation] */ - __in UINT DstSubresource, - /* [annotation] */ - __in UINT DstX, - /* [annotation] */ - __in UINT DstY, - /* [annotation] */ - __in UINT DstZ, - /* [annotation] */ - __in ID3D11Resource *pSrcResource, - /* [annotation] */ - __in UINT SrcSubresource, - /* [annotation] */ - __in_opt const D3D11_BOX *pSrcBox)); + ID3D11Resource *pDstResource, + UINT DstSubresource, + UINT DstX, + UINT DstY, + UINT DstZ, + ID3D11Resource *pSrcResource, + UINT SrcSubresource, + const D3D11_BOX *pSrcBox)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CopyResource( - /* [annotation] */ - __in ID3D11Resource *pDstResource, - /* [annotation] */ - __in ID3D11Resource *pSrcResource)); + ID3D11Resource *pDstResource, + ID3D11Resource *pSrcResource)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, UpdateSubresource( - /* [annotation] */ - __in ID3D11Resource *pDstResource, - /* [annotation] */ - __in UINT DstSubresource, - /* [annotation] */ - __in_opt const D3D11_BOX *pDstBox, - /* [annotation] */ - __in const void *pSrcData, - /* [annotation] */ - __in UINT SrcRowPitch, - /* [annotation] */ - __in UINT SrcDepthPitch)); + ID3D11Resource *pDstResource, + UINT DstSubresource, + const D3D11_BOX *pDstBox, + const void *pSrcData, + UINT SrcRowPitch, + UINT SrcDepthPitch)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CopyStructureCount( - /* [annotation] */ - __in ID3D11Buffer *pDstBuffer, - /* [annotation] */ - __in UINT DstAlignedByteOffset, - /* [annotation] */ - __in ID3D11UnorderedAccessView *pSrcView)); + ID3D11Buffer *pDstBuffer, + UINT DstAlignedByteOffset, + ID3D11UnorderedAccessView *pSrcView)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearRenderTargetView( - /* [annotation] */ - __in ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ - __in const FLOAT ColorRGBA[ 4 ])); + ID3D11RenderTargetView *pRenderTargetView, + const FLOAT ColorRGBA[ 4 ])); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearUnorderedAccessViewUint( - /* [annotation] */ - __in ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ - __in const UINT Values[ 4 ])); + ID3D11UnorderedAccessView *pUnorderedAccessView, + const UINT Values[ 4 ])); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearUnorderedAccessViewFloat( - /* [annotation] */ - __in ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ - __in const FLOAT Values[ 4 ])); + ID3D11UnorderedAccessView *pUnorderedAccessView, + const FLOAT Values[ 4 ])); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearDepthStencilView( - /* [annotation] */ - __in ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ - __in UINT ClearFlags, - /* [annotation] */ - __in FLOAT Depth, - /* [annotation] */ - __in UINT8 Stencil)); + ID3D11DepthStencilView *pDepthStencilView, + UINT ClearFlags, + FLOAT Depth, + UINT8 Stencil)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GenerateMips( - /* [annotation] */ - __in ID3D11ShaderResourceView *pShaderResourceView)); + ID3D11ShaderResourceView *pShaderResourceView)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SetResourceMinLOD( - /* [annotation] */ - __in ID3D11Resource *pResource, + ID3D11Resource *pResource, FLOAT MinLOD)); IMPLEMENT_FUNCTION_SERIALISED(virtual FLOAT STDMETHODCALLTYPE, GetResourceMinLOD( - /* [annotation] */ - __in ID3D11Resource *pResource)); + ID3D11Resource *pResource)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ResolveSubresource( - /* [annotation] */ - __in ID3D11Resource *pDstResource, - /* [annotation] */ - __in UINT DstSubresource, - /* [annotation] */ - __in ID3D11Resource *pSrcResource, - /* [annotation] */ - __in UINT SrcSubresource, - /* [annotation] */ - __in DXGI_FORMAT Format)); + ID3D11Resource *pDstResource, + UINT DstSubresource, + ID3D11Resource *pSrcResource, + UINT SrcSubresource, + DXGI_FORMAT Format)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ExecuteCommandList( - /* [annotation] */ - __in ID3D11CommandList *pCommandList, + ID3D11CommandList *pCommandList, BOOL RestoreContextState)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetShader( - /* [annotation] */ - __in_opt ID3D11HullShader *pHullShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11HullShader *pHullShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetShader( - /* [annotation] */ - __in_opt ID3D11DomainShader *pDomainShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11DomainShader *pDomainShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __in_ecount(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView *const *ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetUnorderedAccessViews( - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ - __in_ecount(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ - __in_ecount(NumUAVs) const UINT *pUAVInitialCounts)); + UINT StartSlot, + UINT NumUAVs, + ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, + const UINT *pUAVInitialCounts)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetShader( - /* [annotation] */ - __in_opt ID3D11ComputeShader *pComputeShader, - /* [annotation] */ - __in_ecount_opt(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, + ID3D11ComputeShader *pComputeShader, + ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __in_ecount(NumSamplers) ID3D11SamplerState *const *ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState *const *ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __in_ecount(NumBuffers) ID3D11Buffer *const *ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetShader( - /* [annotation] */ - __out ID3D11PixelShader **ppPixelShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11PixelShader **ppPixelShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetShader( - /* [annotation] */ - __out ID3D11VertexShader **ppVertexShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11VertexShader **ppVertexShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IAGetInputLayout( - /* [annotation] */ - __out ID3D11InputLayout **ppInputLayout)); + ID3D11InputLayout **ppInputLayout)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IAGetVertexBuffers( - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount_opt(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ - __out_ecount_opt(NumBuffers) UINT *pStrides, - /* [annotation] */ - __out_ecount_opt(NumBuffers) UINT *pOffsets)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppVertexBuffers, + UINT *pStrides, + UINT *pOffsets)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IAGetIndexBuffer( - /* [annotation] */ - __out_opt ID3D11Buffer **pIndexBuffer, - /* [annotation] */ - __out_opt DXGI_FORMAT *Format, - /* [annotation] */ - __out_opt UINT *Offset)); + ID3D11Buffer **pIndexBuffer, + DXGI_FORMAT *Format, + UINT *Offset)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetShader( - /* [annotation] */ - __out ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11GeometryShader **ppGeometryShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, IAGetPrimitiveTopology( - /* [annotation] */ - __out D3D11_PRIMITIVE_TOPOLOGY *pTopology)); + D3D11_PRIMITIVE_TOPOLOGY *pTopology)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GetPredication( - /* [annotation] */ - __out_opt ID3D11Predicate **ppPredicate, - /* [annotation] */ - __out_opt BOOL *pPredicateValue)); + ID3D11Predicate **ppPredicate, + BOOL *pPredicateValue)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMGetRenderTargets( - /* [annotation] */ - __in_range( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ - __out_ecount_opt(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ - __out_opt ID3D11DepthStencilView **ppDepthStencilView)); + UINT NumViews, + ID3D11RenderTargetView **ppRenderTargetViews, + ID3D11DepthStencilView **ppDepthStencilView)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMGetRenderTargetsAndUnorderedAccessViews( - /* [annotation] */ - __in_range( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ - __out_ecount_opt(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ - __out_opt ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ - __out_ecount_opt(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews)); + UINT NumRTVs, + ID3D11RenderTargetView **ppRenderTargetViews, + ID3D11DepthStencilView **ppDepthStencilView, + UINT UAVStartSlot, + UINT NumUAVs, + ID3D11UnorderedAccessView **ppUnorderedAccessViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMGetBlendState( - /* [annotation] */ - __out_opt ID3D11BlendState **ppBlendState, - /* [annotation] */ - __out_opt FLOAT BlendFactor[ 4 ], - /* [annotation] */ - __out_opt UINT *pSampleMask)); + ID3D11BlendState **ppBlendState, + FLOAT BlendFactor[ 4 ], + UINT *pSampleMask)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, OMGetDepthStencilState( - /* [annotation] */ - __out_opt ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ - __out_opt UINT *pStencilRef)); + ID3D11DepthStencilState **ppDepthStencilState, + UINT *pStencilRef)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SOGetTargets( - /* [annotation] */ - __in_range( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppSOTargets)); + UINT NumBuffers, + ID3D11Buffer **ppSOTargets)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSGetState( - /* [annotation] */ - __out ID3D11RasterizerState **ppRasterizerState)); + ID3D11RasterizerState **ppRasterizerState)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSGetViewports( - /* [annotation] */ - __inout /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ - __out_ecount_opt(*pNumViewports) D3D11_VIEWPORT *pViewports)); + UINT *pNumViewports, + D3D11_VIEWPORT *pViewports)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, RSGetScissorRects( - /* [annotation] */ - __inout /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ - __out_ecount_opt(*pNumRects) D3D11_RECT *pRects)); + UINT *pNumRects, + D3D11_RECT *pRects)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetShader( - /* [annotation] */ - __out ID3D11HullShader **ppHullShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11HullShader **ppHullShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetShader( - /* [annotation] */ - __out ID3D11DomainShader **ppDomainShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11DomainShader **ppDomainShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetShaderResources( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ - __out_ecount(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews)); + UINT StartSlot, + UINT NumViews, + ID3D11ShaderResourceView **ppShaderResourceViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetUnorderedAccessViews( - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ - __out_ecount(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews)); + UINT StartSlot, + UINT NumUAVs, + ID3D11UnorderedAccessView **ppUnorderedAccessViews)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetShader( - /* [annotation] */ - __out ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ - __out_ecount_opt(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ - __inout_opt UINT *pNumClassInstances)); + ID3D11ComputeShader **ppComputeShader, + ID3D11ClassInstance **ppClassInstances, + UINT *pNumClassInstances)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetSamplers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ - __out_ecount(NumSamplers) ID3D11SamplerState **ppSamplers)); + UINT StartSlot, + UINT NumSamplers, + ID3D11SamplerState **ppSamplers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetConstantBuffers( - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - __in_range( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - __out_ecount(NumBuffers) ID3D11Buffer **ppConstantBuffers)); + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearState( void)); @@ -1106,223 +819,137 @@ public: IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, FinishCommandList( BOOL RestoreDeferredContextState, - /* [annotation] */ - __out_opt ID3D11CommandList **ppCommandList)); + ID3D11CommandList **ppCommandList)); ////////////////////////////// // implement ID3D11DeviceContext1 // outside the define as it doesn't depend on any 11_1 definitions, and it's just an unused // virtual function. We re-use the Serialise_UpdateSubresource1 function for Serialise_UpdateSubresource - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, UpdateSubresource1( - /* [annotation] */ - _In_ ID3D11Resource *pDstResource, - /* [annotation] */ - _In_ UINT DstSubresource, - /* [annotation] */ - _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ - _In_ const void *pSrcData, - /* [annotation] */ - _In_ UINT SrcRowPitch, - /* [annotation] */ - _In_ UINT SrcDepthPitch, - /* [annotation] */ - _In_ UINT CopyFlags)); + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, UpdateSubresource1( + ID3D11Resource *pDstResource, + UINT DstSubresource, + const D3D11_BOX *pDstBox, + const void *pSrcData, + UINT SrcRowPitch, + UINT SrcDepthPitch, + UINT CopyFlags)); #if defined(INCLUDE_D3D_11_1) - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CopySubresourceRegion1( - /* [annotation] */ - _In_ ID3D11Resource *pDstResource, - /* [annotation] */ - _In_ UINT DstSubresource, - /* [annotation] */ - _In_ UINT DstX, - /* [annotation] */ - _In_ UINT DstY, - /* [annotation] */ - _In_ UINT DstZ, - /* [annotation] */ - _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ - _In_ UINT SrcSubresource, - /* [annotation] */ - _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ - _In_ UINT CopyFlags)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardResource( - /* [annotation] */ - _In_ ID3D11Resource *pResource)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardView( - /* [annotation] */ - _In_ ID3D11View *pResourceView)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ - _In_reads_opt_(NumBuffers) const UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetConstantBuffers1( - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ - _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ - _Out_writes_opt_(NumBuffers) UINT *pNumConstants)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SwapDeviceContextState( - /* [annotation] */ - _In_ ID3DDeviceContextState *pState, - /* [annotation] */ - _Out_opt_ ID3DDeviceContextState **ppPreviousState)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearView( - /* [annotation] */ - _In_ ID3D11View *pView, - /* [annotation] */ - _In_ const FLOAT Color[ 4 ], - /* [annotation] */ - _In_reads_opt_(NumRects) const D3D11_RECT *pRect, - UINT NumRects)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardView1( - /* [annotation] */ - _In_ ID3D11View *pResourceView, - /* [annotation] */ - _In_reads_opt_(NumRects) const D3D11_RECT *pRects, - UINT NumRects)); + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CopySubresourceRegion1( + ID3D11Resource *pDstResource, + UINT DstSubresource, + UINT DstX, + UINT DstY, + UINT DstZ, + ID3D11Resource *pSrcResource, + UINT SrcSubresource, + const D3D11_BOX *pSrcBox, + UINT CopyFlags)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardResource( + ID3D11Resource *pResource)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardView( + ID3D11View *pResourceView)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSSetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer *const *ppConstantBuffers, + const UINT *pFirstConstant, + const UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, VSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, HSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, PSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CSGetConstantBuffers1( + UINT StartSlot, + UINT NumBuffers, + ID3D11Buffer **ppConstantBuffers, + UINT *pFirstConstant, + UINT *pNumConstants)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, SwapDeviceContextState( + ID3DDeviceContextState *pState, + ID3DDeviceContextState **ppPreviousState)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, ClearView( + ID3D11View *pView, + const FLOAT Color[ 4 ], + const D3D11_RECT *pRect, + UINT NumRects)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, DiscardView1( + ID3D11View *pResourceView, + const D3D11_RECT *pRects, + UINT NumRects)); #endif }; diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index 3bdab873d..5a5247848 100644 --- a/renderdoc/driver/d3d11/d3d11_device.h +++ b/renderdoc/driver/d3d11/d3d11_device.h @@ -308,12 +308,9 @@ public: ////////////////////////////// // implement ID3D11Device IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateBuffer( - /* [annotation] */ - __in const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ - __in_opt const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Buffer **ppBuffer)); + const D3D11_BUFFER_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Buffer **ppBuffer)); template TextureDisplayType DispTypeForTexture(TexDesc &Descriptor); @@ -322,277 +319,175 @@ public: UINT w, UINT h, UINT d, DXGI_FORMAT fmt, UINT mips, UINT arr, bool HasData); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateTexture1D( - /* [annotation] */ - __in const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture1D **ppTexture1D)); + const D3D11_TEXTURE1D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture1D **ppTexture1D)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateTexture2D( - /* [annotation] */ - __in const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture2D **ppTexture2D)); + const D3D11_TEXTURE2D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture2D **ppTexture2D)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateTexture3D( - /* [annotation] */ - __in const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture3D **ppTexture3D)); + const D3D11_TEXTURE3D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture3D **ppTexture3D)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateShaderResourceView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11ShaderResourceView **ppSRView)); + ID3D11Resource *pResource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, + ID3D11ShaderResourceView **ppSRView)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateUnorderedAccessView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11UnorderedAccessView **ppUAView)); + ID3D11Resource *pResource, + const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, + ID3D11UnorderedAccessView **ppUAView)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateRenderTargetView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11RenderTargetView **ppRTView)); + ID3D11Resource *pResource, + const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, + ID3D11RenderTargetView **ppRTView)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDepthStencilView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilView **ppDepthStencilView)); + ID3D11Resource *pResource, + const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, + ID3D11DepthStencilView **ppDepthStencilView)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateInputLayout( - /* [annotation] */ - __in_ecount(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ - __in const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __out_opt ID3D11InputLayout **ppInputLayout)); + const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, + UINT NumElements, + const void *pShaderBytecodeWithInputSignature, + SIZE_T BytecodeLength, + ID3D11InputLayout **ppInputLayout)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateVertexShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11VertexShader **ppVertexShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11VertexShader **ppVertexShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateGeometryShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateGeometryShaderWithStreamOutput( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_ecount_opt(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ - __in_range( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ - __in_ecount_opt(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ - __in_range( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ - __in UINT RasterizedStream, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, + UINT NumEntries, + const UINT *pBufferStrides, + UINT NumStrides, + UINT RasterizedStream, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreatePixelShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11PixelShader **ppPixelShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11PixelShader **ppPixelShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateHullShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11HullShader **ppHullShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11HullShader **ppHullShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDomainShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11DomainShader **ppDomainShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11DomainShader **ppDomainShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateComputeShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11ComputeShader **ppComputeShader)); + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11ComputeShader **ppComputeShader)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateClassLinkage( - /* [annotation] */ - __out ID3D11ClassLinkage **ppLinkage)); + ID3D11ClassLinkage **ppLinkage)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateBlendState( - /* [annotation] */ - __in const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ - __out_opt ID3D11BlendState **ppBlendState)); + const D3D11_BLEND_DESC *pBlendStateDesc, + ID3D11BlendState **ppBlendState)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDepthStencilState( - /* [annotation] */ - __in const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilState **ppDepthStencilState)); + const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, + ID3D11DepthStencilState **ppDepthStencilState)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateRasterizerState( - /* [annotation] */ - __in const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ - __out_opt ID3D11RasterizerState **ppRasterizerState)); + const D3D11_RASTERIZER_DESC *pRasterizerDesc, + ID3D11RasterizerState **ppRasterizerState)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateSamplerState( - /* [annotation] */ - __in const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ - __out_opt ID3D11SamplerState **ppSamplerState)); + const D3D11_SAMPLER_DESC *pSamplerDesc, + ID3D11SamplerState **ppSamplerState)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateQuery( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ - __out_opt ID3D11Query **ppQuery)); + const D3D11_QUERY_DESC *pQueryDesc, + ID3D11Query **ppQuery)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreatePredicate( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ - __out_opt ID3D11Predicate **ppPredicate)); + const D3D11_QUERY_DESC *pPredicateDesc, + ID3D11Predicate **ppPredicate)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateCounter( - /* [annotation] */ - __in const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ - __out_opt ID3D11Counter **ppCounter)); + const D3D11_COUNTER_DESC *pCounterDesc, + ID3D11Counter **ppCounter)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDeferredContext( UINT ContextFlags, - /* [annotation] */ - __out_opt ID3D11DeviceContext **ppDeferredContext)); + ID3D11DeviceContext **ppDeferredContext)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, OpenSharedResource( - /* [annotation] */ - __in HANDLE hResource, - /* [annotation] */ - __in REFIID ReturnedInterface, - /* [annotation] */ - __out_opt void **ppResource)); + HANDLE hResource, + REFIID ReturnedInterface, + void **ppResource)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CheckFormatSupport( - /* [annotation] */ - __in DXGI_FORMAT Format, - /* [annotation] */ - __out UINT *pFormatSupport)); + DXGI_FORMAT Format, + UINT *pFormatSupport)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CheckMultisampleQualityLevels( - /* [annotation] */ - __in DXGI_FORMAT Format, - /* [annotation] */ - __in UINT SampleCount, - /* [annotation] */ - __out UINT *pNumQualityLevels)); + DXGI_FORMAT Format, + UINT SampleCount, + UINT *pNumQualityLevels)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, CheckCounterInfo( - /* [annotation] */ - __out D3D11_COUNTER_INFO *pCounterInfo)); + D3D11_COUNTER_INFO *pCounterInfo)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CheckCounter( - /* [annotation] */ - __in const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ - __out D3D11_COUNTER_TYPE *pType, - /* [annotation] */ - __out UINT *pActiveCounters, - /* [annotation] */ - __out_ecount_opt(*pNameLength) LPSTR szName, - /* [annotation] */ - __inout_opt UINT *pNameLength, - /* [annotation] */ - __out_ecount_opt(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ - __inout_opt UINT *pUnitsLength, - /* [annotation] */ - __out_ecount_opt(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ - __inout_opt UINT *pDescriptionLength)); + const D3D11_COUNTER_DESC *pDesc, + D3D11_COUNTER_TYPE *pType, + UINT *pActiveCounters, + LPSTR szName, + UINT *pNameLength, + LPSTR szUnits, + UINT *pUnitsLength, + LPSTR szDescription, + UINT *pDescriptionLength)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CheckFeatureSupport( D3D11_FEATURE Feature, - /* [annotation] */ - __out_bcount(FeatureSupportDataSize) void *pFeatureSupportData, + void *pFeatureSupportData, UINT FeatureSupportDataSize)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, GetPrivateData( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __inout UINT *pDataSize, - /* [annotation] */ - __out_bcount_opt(*pDataSize) void *pData)); + REFGUID guid, + UINT *pDataSize, + void *pData)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, SetPrivateData( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __in UINT DataSize, - /* [annotation] */ - __in_bcount_opt(DataSize) const void *pData)); + REFGUID guid, + UINT DataSize, + const void *pData)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, SetPrivateDataInterface( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __in_opt const IUnknown *pData)); + REFGUID guid, + const IUnknown *pData)); IMPLEMENT_FUNCTION_SERIALISED(virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE, GetFeatureLevel( void)); @@ -601,67 +496,49 @@ public: IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, GetDeviceRemovedReason( void)); IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GetImmediateContext( - /* [annotation] */ - __out ID3D11DeviceContext **ppImmediateContext)); + ID3D11DeviceContext **ppImmediateContext)); IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, SetExceptionMode( UINT RaiseFlags)); IMPLEMENT_FUNCTION_SERIALISED(virtual UINT STDMETHODCALLTYPE, GetExceptionMode( void)); - ////////////////////////////// // implement ID3D11Device1 #if defined(INCLUDE_D3D_11_1) - IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GetImmediateContext1(ID3D11DeviceContext1 **ppImmediateContext)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDeferredContext1( - UINT ContextFlags, - /* [annotation] */ - _Out_opt_ ID3D11DeviceContext1 **ppDeferredContext)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateBlendState1( - /* [annotation] */ - _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ - _Out_opt_ ID3D11BlendState1 **ppBlendState)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateRasterizerState1( - /* [annotation] */ - _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ - _Out_opt_ ID3D11RasterizerState1 **ppRasterizerState)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDeviceContextState( - UINT Flags, - /* [annotation] */ - _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, - UINT FeatureLevels, - UINT SDKVersion, - REFIID EmulatedInterface, - /* [annotation] */ - _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ - _Out_opt_ ID3DDeviceContextState **ppContextState)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, OpenSharedResource1( - /* [annotation] */ - _In_ HANDLE hResource, - /* [annotation] */ - _In_ REFIID returnedInterface, - /* [annotation] */ - _Out_ void **ppResource)); - - IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, OpenSharedResourceByName( - /* [annotation] */ - _In_ LPCWSTR lpName, - /* [annotation] */ - _In_ DWORD dwDesiredAccess, - /* [annotation] */ - _In_ REFIID returnedInterface, - /* [annotation] */ - _Out_ void **ppResource)); - + IMPLEMENT_FUNCTION_SERIALISED(virtual void STDMETHODCALLTYPE, GetImmediateContext1(ID3D11DeviceContext1 **ppImmediateContext)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDeferredContext1( + UINT ContextFlags, + ID3D11DeviceContext1 **ppDeferredContext)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateBlendState1( + const D3D11_BLEND_DESC1 *pBlendStateDesc, + ID3D11BlendState1 **ppBlendState)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateRasterizerState1( + const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, + ID3D11RasterizerState1 **ppRasterizerState)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, CreateDeviceContextState( + UINT Flags, + const D3D_FEATURE_LEVEL *pFeatureLevels, + UINT FeatureLevels, + UINT SDKVersion, + REFIID EmulatedInterface, + D3D_FEATURE_LEVEL *pChosenFeatureLevel, + ID3DDeviceContextState **ppContextState)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, OpenSharedResource1( + HANDLE hResource, + REFIID returnedInterface, + void **ppResource)); + + IMPLEMENT_FUNCTION_SERIALISED(virtual HRESULT STDMETHODCALLTYPE, OpenSharedResourceByName( + LPCWSTR lpName, + DWORD dwDesiredAccess, + REFIID returnedInterface, + void **ppResource)); #endif }; diff --git a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp index e60ef2768..d4339eab3 100644 --- a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp @@ -28,12 +28,9 @@ #include "driver/d3d11/d3d11_resources.h" bool WrappedID3D11Device::Serialise_CreateBuffer( - /* [annotation] */ - __in const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ - __in_opt const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Buffer **ppBuffer) + const D3D11_BUFFER_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Buffer **ppBuffer) { D3D11_SUBRESOURCE_DATA fakeData; RDCEraseEl(fakeData); @@ -137,12 +134,9 @@ bool WrappedID3D11Device::Serialise_CreateBuffer( } HRESULT WrappedID3D11Device::CreateBuffer( - /* [annotation] */ - __in const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ - __in_opt const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Buffer **ppBuffer) + const D3D11_BUFFER_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Buffer **ppBuffer) { // validation, returns S_FALSE for valid params, or an error code if(ppBuffer == NULL) return m_pDevice->CreateBuffer(pDesc, pInitialData, NULL); @@ -305,12 +299,9 @@ TextureDisplayType WrappedID3D11Device::DispTypeForTexture(TexDesc &Descriptor) } bool WrappedID3D11Device::Serialise_CreateTexture1D( - /* [annotation] */ - __in const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture1D **ppTexture1D) + const D3D11_TEXTURE1D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture1D **ppTexture1D) { SERIALISE_ELEMENT_PTR(D3D11_TEXTURE1D_DESC, Descriptor, pDesc); SERIALISE_ELEMENT(ResourceId, pTexture, GetIDForResource(*ppTexture1D)); @@ -361,12 +352,9 @@ bool WrappedID3D11Device::Serialise_CreateTexture1D( } HRESULT WrappedID3D11Device::CreateTexture1D( - /* [annotation] */ - __in const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture1D **ppTexture1D) + const D3D11_TEXTURE1D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture1D **ppTexture1D) { // validation, returns S_FALSE for valid params, or an error code if(ppTexture1D == NULL) return m_pDevice->CreateTexture1D(pDesc, pInitialData, NULL); @@ -412,12 +400,9 @@ HRESULT WrappedID3D11Device::CreateTexture1D( } bool WrappedID3D11Device::Serialise_CreateTexture2D( - /* [annotation] */ - __in const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture2D **ppTexture2D) + const D3D11_TEXTURE2D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture2D **ppTexture2D) { SERIALISE_ELEMENT_PTR(D3D11_TEXTURE2D_DESC, Descriptor, pDesc); SERIALISE_ELEMENT(ResourceId, pTexture, GetIDForResource(*ppTexture2D)); @@ -468,12 +453,9 @@ bool WrappedID3D11Device::Serialise_CreateTexture2D( } HRESULT WrappedID3D11Device::CreateTexture2D( - /* [annotation] */ - __in const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels * pDesc->ArraySize) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture2D **ppTexture2D) + const D3D11_TEXTURE2D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture2D **ppTexture2D) { // validation, returns S_FALSE for valid params, or an error code if(ppTexture2D == NULL) return m_pDevice->CreateTexture2D(pDesc, pInitialData, NULL); @@ -519,12 +501,9 @@ HRESULT WrappedID3D11Device::CreateTexture2D( } bool WrappedID3D11Device::Serialise_CreateTexture3D( - /* [annotation] */ - __in const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture3D **ppTexture3D) + const D3D11_TEXTURE3D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture3D **ppTexture3D) { SERIALISE_ELEMENT_PTR(D3D11_TEXTURE3D_DESC, Descriptor, pDesc); SERIALISE_ELEMENT(ResourceId, pTexture, GetIDForResource(*ppTexture3D)); @@ -575,12 +554,9 @@ bool WrappedID3D11Device::Serialise_CreateTexture3D( } HRESULT WrappedID3D11Device::CreateTexture3D( - /* [annotation] */ - __in const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ - __in_xcount_opt(pDesc->MipLevels) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ - __out_opt ID3D11Texture3D **ppTexture3D) + const D3D11_TEXTURE3D_DESC *pDesc, + const D3D11_SUBRESOURCE_DATA *pInitialData, + ID3D11Texture3D **ppTexture3D) { // validation, returns S_FALSE for valid params, or an error code if(ppTexture3D == NULL) return m_pDevice->CreateTexture3D(pDesc, pInitialData, NULL); @@ -626,12 +602,9 @@ HRESULT WrappedID3D11Device::CreateTexture3D( } bool WrappedID3D11Device::Serialise_CreateShaderResourceView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11ShaderResourceView **ppSRView) + ID3D11Resource *pResource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, + ID3D11ShaderResourceView **ppSRView) { SERIALISE_ELEMENT(ResourceId, Resource, GetIDForResource(pResource)); SERIALISE_ELEMENT(bool, HasDesc, pDesc != NULL); @@ -707,12 +680,9 @@ bool WrappedID3D11Device::Serialise_CreateShaderResourceView( } HRESULT WrappedID3D11Device::CreateShaderResourceView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11ShaderResourceView **ppSRView) + ID3D11Resource *pResource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, + ID3D11ShaderResourceView **ppSRView) { // validation, returns S_FALSE for valid params, or an error code if(ppSRView == NULL) return m_pDevice->CreateShaderResourceView(GetResourceManager()->UnwrapResource(pResource), pDesc, NULL); @@ -761,12 +731,9 @@ HRESULT WrappedID3D11Device::CreateShaderResourceView( } bool WrappedID3D11Device::Serialise_CreateUnorderedAccessView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11UnorderedAccessView **ppUAView) + ID3D11Resource *pResource, + const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, + ID3D11UnorderedAccessView **ppUAView) { SERIALISE_ELEMENT(ResourceId, Resource, GetIDForResource(pResource)); SERIALISE_ELEMENT(bool, HasDesc, pDesc != NULL); @@ -811,12 +778,9 @@ bool WrappedID3D11Device::Serialise_CreateUnorderedAccessView( } HRESULT WrappedID3D11Device::CreateUnorderedAccessView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11UnorderedAccessView **ppUAView) + ID3D11Resource *pResource, + const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, + ID3D11UnorderedAccessView **ppUAView) { // validation, returns S_FALSE for valid params, or an error code if(ppUAView == NULL) return m_pDevice->CreateUnorderedAccessView(GetResourceManager()->UnwrapResource(pResource), pDesc, NULL); @@ -865,12 +829,9 @@ HRESULT WrappedID3D11Device::CreateUnorderedAccessView( } bool WrappedID3D11Device::Serialise_CreateRenderTargetView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11RenderTargetView **ppRTView) + ID3D11Resource *pResource, + const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, + ID3D11RenderTargetView **ppRTView) { SERIALISE_ELEMENT(ResourceId, Resource, GetIDForResource(pResource)); SERIALISE_ELEMENT(bool, HasDesc, pDesc != NULL); @@ -942,12 +903,9 @@ bool WrappedID3D11Device::Serialise_CreateRenderTargetView( } HRESULT WrappedID3D11Device::CreateRenderTargetView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11RenderTargetView **ppRTView) + ID3D11Resource *pResource, + const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, + ID3D11RenderTargetView **ppRTView) { // validation, returns S_FALSE for valid params, or an error code if(ppRTView == NULL) return m_pDevice->CreateRenderTargetView(GetResourceManager()->UnwrapResource(pResource), pDesc, NULL); @@ -997,12 +955,9 @@ HRESULT WrappedID3D11Device::CreateRenderTargetView( } bool WrappedID3D11Device::Serialise_CreateDepthStencilView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilView **ppDepthStencilView) + ID3D11Resource *pResource, + const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, + ID3D11DepthStencilView **ppDepthStencilView) { SERIALISE_ELEMENT(ResourceId, Resource, GetIDForResource(pResource)); SERIALISE_ELEMENT(bool, HasDesc, pDesc != NULL); @@ -1046,12 +1001,9 @@ bool WrappedID3D11Device::Serialise_CreateDepthStencilView( } HRESULT WrappedID3D11Device::CreateDepthStencilView( - /* [annotation] */ - __in ID3D11Resource *pResource, - /* [annotation] */ - __in_opt const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilView **ppDepthStencilView) + ID3D11Resource *pResource, + const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, + ID3D11DepthStencilView **ppDepthStencilView) { // validation, returns S_FALSE for valid params, or an error code if(ppDepthStencilView == NULL) return m_pDevice->CreateDepthStencilView(GetResourceManager()->UnwrapResource(pResource), pDesc, NULL); @@ -1101,16 +1053,11 @@ HRESULT WrappedID3D11Device::CreateDepthStencilView( } bool WrappedID3D11Device::Serialise_CreateInputLayout( - /* [annotation] */ - __in_ecount(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ - __in const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __out_opt ID3D11InputLayout **ppInputLayout) + const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, + UINT NumElements, + const void *pShaderBytecodeWithInputSignature, + SIZE_T BytecodeLength, + ID3D11InputLayout **ppInputLayout) { SERIALISE_ELEMENT(uint32_t, NumElems, NumElements); @@ -1169,16 +1116,11 @@ bool WrappedID3D11Device::Serialise_CreateInputLayout( } HRESULT WrappedID3D11Device::CreateInputLayout( - /* [annotation] */ - __in_ecount(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ - __in_range( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ - __in const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __out_opt ID3D11InputLayout **ppInputLayout) + const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, + UINT NumElements, + const void *pShaderBytecodeWithInputSignature, + SIZE_T BytecodeLength, + ID3D11InputLayout **ppInputLayout) { // validation, returns S_FALSE for valid params, or an error code if(ppInputLayout == NULL) return m_pDevice->CreateInputLayout(pInputElementDescs, NumElements, pShaderBytecodeWithInputSignature, BytecodeLength, NULL); @@ -1208,14 +1150,10 @@ HRESULT WrappedID3D11Device::CreateInputLayout( } bool WrappedID3D11Device::Serialise_CreateVertexShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11VertexShader **ppVertexShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11VertexShader **ppVertexShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, (void *&)pShaderBytecode, BytecodeLength); @@ -1247,14 +1185,10 @@ bool WrappedID3D11Device::Serialise_CreateVertexShader( } HRESULT WrappedID3D11Device::CreateVertexShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11VertexShader **ppVertexShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11VertexShader **ppVertexShader) { // validation, returns S_FALSE for valid params, or an error code if(ppVertexShader == NULL) return m_pDevice->CreateVertexShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -1298,14 +1232,10 @@ HRESULT WrappedID3D11Device::CreateVertexShader( } bool WrappedID3D11Device::Serialise_CreateGeometryShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1337,14 +1267,10 @@ bool WrappedID3D11Device::Serialise_CreateGeometryShader( } HRESULT WrappedID3D11Device::CreateGeometryShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader) { // validation, returns S_FALSE for valid params, or an error code if(ppGeometryShader == NULL) return m_pDevice->CreateGeometryShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -1389,24 +1315,15 @@ HRESULT WrappedID3D11Device::CreateGeometryShader( bool WrappedID3D11Device::Serialise_CreateGeometryShaderWithStreamOutput( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_ecount_opt(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ - __in_range( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ - __in_ecount_opt(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ - __in_range( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ - __in UINT RasterizedStream, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, + UINT NumEntries, + const UINT *pBufferStrides, + UINT NumStrides, + UINT RasterizedStream, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1453,24 +1370,15 @@ bool WrappedID3D11Device::Serialise_CreateGeometryShaderWithStreamOutput( } HRESULT WrappedID3D11Device::CreateGeometryShaderWithStreamOutput( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_ecount_opt(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ - __in_range( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ - __in_ecount_opt(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ - __in_range( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ - __in UINT RasterizedStream, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11GeometryShader **ppGeometryShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, + UINT NumEntries, + const UINT *pBufferStrides, + UINT NumStrides, + UINT RasterizedStream, + ID3D11ClassLinkage *pClassLinkage, + ID3D11GeometryShader **ppGeometryShader) { // validation, returns S_FALSE for valid params, or an error code if(ppGeometryShader == NULL) return m_pDevice->CreateGeometryShaderWithStreamOutput(pShaderBytecode, BytecodeLength, pSODeclaration, @@ -1519,14 +1427,10 @@ HRESULT WrappedID3D11Device::CreateGeometryShaderWithStreamOutput( } bool WrappedID3D11Device::Serialise_CreatePixelShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11PixelShader **ppPixelShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11PixelShader **ppPixelShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1558,14 +1462,10 @@ bool WrappedID3D11Device::Serialise_CreatePixelShader( } HRESULT WrappedID3D11Device::CreatePixelShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11PixelShader **ppPixelShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11PixelShader **ppPixelShader) { // validation, returns S_FALSE for valid params, or an error code if(ppPixelShader == NULL) return m_pDevice->CreatePixelShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -1609,14 +1509,10 @@ HRESULT WrappedID3D11Device::CreatePixelShader( } bool WrappedID3D11Device::Serialise_CreateHullShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11HullShader **ppHullShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11HullShader **ppHullShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1648,14 +1544,10 @@ bool WrappedID3D11Device::Serialise_CreateHullShader( } HRESULT WrappedID3D11Device::CreateHullShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11HullShader **ppHullShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11HullShader **ppHullShader) { // validation, returns S_FALSE for valid params, or an error code if(ppHullShader == NULL) return m_pDevice->CreateHullShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -1699,14 +1591,10 @@ HRESULT WrappedID3D11Device::CreateHullShader( } bool WrappedID3D11Device::Serialise_CreateDomainShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11DomainShader **ppDomainShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11DomainShader **ppDomainShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1738,14 +1626,10 @@ bool WrappedID3D11Device::Serialise_CreateDomainShader( } HRESULT WrappedID3D11Device::CreateDomainShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11DomainShader **ppDomainShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11DomainShader **ppDomainShader) { // validation, returns S_FALSE for valid params, or an error code if(ppDomainShader == NULL) return m_pDevice->CreateDomainShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -1789,14 +1673,10 @@ HRESULT WrappedID3D11Device::CreateDomainShader( } bool WrappedID3D11Device::Serialise_CreateComputeShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11ComputeShader **ppComputeShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11ComputeShader **ppComputeShader) { SERIALISE_ELEMENT(uint32_t, BytecodeLen, (uint32_t)BytecodeLength); SERIALISE_ELEMENT_BUF(byte *, ShaderBytecode, pShaderBytecode, BytecodeLength); @@ -1828,14 +1708,10 @@ bool WrappedID3D11Device::Serialise_CreateComputeShader( } HRESULT WrappedID3D11Device::CreateComputeShader( - /* [annotation] */ - __in const void *pShaderBytecode, - /* [annotation] */ - __in SIZE_T BytecodeLength, - /* [annotation] */ - __in_opt ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ - __out_opt ID3D11ComputeShader **ppComputeShader) + const void *pShaderBytecode, + SIZE_T BytecodeLength, + ID3D11ClassLinkage *pClassLinkage, + ID3D11ComputeShader **ppComputeShader) { // validation, returns S_FALSE for valid params, or an error code if(ppComputeShader == NULL) return m_pDevice->CreateComputeShader(pShaderBytecode, BytecodeLength, UNWRAP(WrappedID3D11ClassLinkage, pClassLinkage), NULL); @@ -2003,8 +1879,7 @@ ID3D11ClassInstance *WrappedID3D11Device::GetClassInstance(LPCSTR pClassInstance } bool WrappedID3D11Device::Serialise_CreateClassLinkage( - /* [annotation] */ - __out ID3D11ClassLinkage **ppLinkage) + ID3D11ClassLinkage **ppLinkage) { SERIALISE_ELEMENT(ResourceId, pLinkage, GetIDForResource(*ppLinkage)); @@ -2029,8 +1904,7 @@ bool WrappedID3D11Device::Serialise_CreateClassLinkage( } HRESULT WrappedID3D11Device::CreateClassLinkage( - /* [annotation] */ - __out ID3D11ClassLinkage **ppLinkage) + ID3D11ClassLinkage **ppLinkage) { // get 'real' return value for NULL parameter if(ppLinkage == NULL) return m_pDevice->CreateClassLinkage(NULL); @@ -2060,10 +1934,8 @@ HRESULT WrappedID3D11Device::CreateClassLinkage( } bool WrappedID3D11Device::Serialise_CreateBlendState( - /* [annotation] */ - __in const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ - __out_opt ID3D11BlendState **ppBlendState) + const D3D11_BLEND_DESC *pBlendStateDesc, + ID3D11BlendState **ppBlendState) { SERIALISE_ELEMENT_PTR(D3D11_BLEND_DESC, Descriptor, pBlendStateDesc); SERIALISE_ELEMENT(ResourceId, State, GetIDForResource(*ppBlendState)); @@ -2099,10 +1971,8 @@ bool WrappedID3D11Device::Serialise_CreateBlendState( } HRESULT WrappedID3D11Device::CreateBlendState( - /* [annotation] */ - __in const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ - __out_opt ID3D11BlendState **ppBlendState) + const D3D11_BLEND_DESC *pBlendStateDesc, + ID3D11BlendState **ppBlendState) { // validation, returns S_FALSE for valid params, or an error code if(ppBlendState == NULL) return m_pDevice->CreateBlendState(pBlendStateDesc, NULL); @@ -2147,10 +2017,8 @@ HRESULT WrappedID3D11Device::CreateBlendState( } bool WrappedID3D11Device::Serialise_CreateDepthStencilState( - /* [annotation] */ - __in const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilState **ppDepthStencilState) + const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, + ID3D11DepthStencilState **ppDepthStencilState) { SERIALISE_ELEMENT_PTR(D3D11_DEPTH_STENCIL_DESC, Descriptor, pDepthStencilDesc); SERIALISE_ELEMENT(ResourceId, State, GetIDForResource(*ppDepthStencilState)); @@ -2176,10 +2044,8 @@ bool WrappedID3D11Device::Serialise_CreateDepthStencilState( } HRESULT WrappedID3D11Device::CreateDepthStencilState( - /* [annotation] */ - __in const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ - __out_opt ID3D11DepthStencilState **ppDepthStencilState) + const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, + ID3D11DepthStencilState **ppDepthStencilState) { // validation, returns S_FALSE for valid params, or an error code if(ppDepthStencilState == NULL) return m_pDevice->CreateDepthStencilState(pDepthStencilDesc, NULL); @@ -2224,10 +2090,8 @@ HRESULT WrappedID3D11Device::CreateDepthStencilState( } bool WrappedID3D11Device::Serialise_CreateRasterizerState( - /* [annotation] */ - __in const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ - __out_opt ID3D11RasterizerState **ppRasterizerState) + const D3D11_RASTERIZER_DESC *pRasterizerDesc, + ID3D11RasterizerState **ppRasterizerState) { SERIALISE_ELEMENT_PTR(D3D11_RASTERIZER_DESC, Descriptor, pRasterizerDesc); SERIALISE_ELEMENT(ResourceId, State, GetIDForResource(*ppRasterizerState)); @@ -2253,10 +2117,8 @@ bool WrappedID3D11Device::Serialise_CreateRasterizerState( } HRESULT WrappedID3D11Device::CreateRasterizerState( - /* [annotation] */ - __in const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ - __out_opt ID3D11RasterizerState **ppRasterizerState) + const D3D11_RASTERIZER_DESC *pRasterizerDesc, + ID3D11RasterizerState **ppRasterizerState) { // validation, returns S_FALSE for valid params, or an error code if(ppRasterizerState == NULL) return m_pDevice->CreateRasterizerState(pRasterizerDesc, NULL); @@ -2301,10 +2163,8 @@ HRESULT WrappedID3D11Device::CreateRasterizerState( } bool WrappedID3D11Device::Serialise_CreateSamplerState( - /* [annotation] */ - __in const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ - __out_opt ID3D11SamplerState **ppSamplerState) + const D3D11_SAMPLER_DESC *pSamplerDesc, + ID3D11SamplerState **ppSamplerState) { SERIALISE_ELEMENT_PTR(D3D11_SAMPLER_DESC, Descriptor, pSamplerDesc); SERIALISE_ELEMENT(ResourceId, State, GetIDForResource(*ppSamplerState)); @@ -2330,10 +2190,8 @@ bool WrappedID3D11Device::Serialise_CreateSamplerState( } HRESULT WrappedID3D11Device::CreateSamplerState( - /* [annotation] */ - __in const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ - __out_opt ID3D11SamplerState **ppSamplerState) + const D3D11_SAMPLER_DESC *pSamplerDesc, + ID3D11SamplerState **ppSamplerState) { // validation, returns S_FALSE for valid params, or an error code if(ppSamplerState == NULL) return m_pDevice->CreateSamplerState(pSamplerDesc, NULL); @@ -2378,10 +2236,8 @@ HRESULT WrappedID3D11Device::CreateSamplerState( } bool WrappedID3D11Device::Serialise_CreateQuery( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ - __out_opt ID3D11Query **ppQuery) + const D3D11_QUERY_DESC *pQueryDesc, + ID3D11Query **ppQuery) { SERIALISE_ELEMENT_PTR(D3D11_QUERY_DESC, Descriptor, pQueryDesc); SERIALISE_ELEMENT(ResourceId, Query, GetIDForResource(*ppQuery)); @@ -2407,10 +2263,8 @@ bool WrappedID3D11Device::Serialise_CreateQuery( } HRESULT WrappedID3D11Device::CreateQuery( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ - __out_opt ID3D11Query **ppQuery) + const D3D11_QUERY_DESC *pQueryDesc, + ID3D11Query **ppQuery) { // validation, returns S_FALSE for valid params, or an error code if(ppQuery == NULL) return m_pDevice->CreateQuery(pQueryDesc, NULL); @@ -2429,10 +2283,8 @@ HRESULT WrappedID3D11Device::CreateQuery( } bool WrappedID3D11Device::Serialise_CreatePredicate( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ - __out_opt ID3D11Predicate **ppPredicate) + const D3D11_QUERY_DESC *pPredicateDesc, + ID3D11Predicate **ppPredicate) { SERIALISE_ELEMENT_PTR(D3D11_QUERY_DESC, Descriptor, pPredicateDesc); SERIALISE_ELEMENT(ResourceId, Predicate, GetIDForResource(*ppPredicate)); @@ -2458,10 +2310,8 @@ bool WrappedID3D11Device::Serialise_CreatePredicate( } HRESULT WrappedID3D11Device::CreatePredicate( - /* [annotation] */ - __in const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ - __out_opt ID3D11Predicate **ppPredicate) + const D3D11_QUERY_DESC *pPredicateDesc, + ID3D11Predicate **ppPredicate) { // validation, returns S_FALSE for valid params, or an error code if(ppPredicate == NULL) return m_pDevice->CreatePredicate(pPredicateDesc, NULL); @@ -2491,10 +2341,8 @@ HRESULT WrappedID3D11Device::CreatePredicate( } bool WrappedID3D11Device::Serialise_CreateCounter( - /* [annotation] */ - __in const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ - __out_opt ID3D11Counter **ppCounter) + const D3D11_COUNTER_DESC *pCounterDesc, + ID3D11Counter **ppCounter) { SERIALISE_ELEMENT_PTR(D3D11_COUNTER_DESC, Descriptor, pCounterDesc); SERIALISE_ELEMENT(ResourceId, Counter, GetIDForResource(*ppCounter)); @@ -2520,10 +2368,8 @@ bool WrappedID3D11Device::Serialise_CreateCounter( } HRESULT WrappedID3D11Device::CreateCounter( - /* [annotation] */ - __in const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ - __out_opt ID3D11Counter **ppCounter) + const D3D11_COUNTER_DESC *pCounterDesc, + ID3D11Counter **ppCounter) { // validation, returns S_FALSE for valid params, or an error code if(ppCounter == NULL) return m_pDevice->CreateCounter(pCounterDesc, NULL); @@ -2542,10 +2388,8 @@ HRESULT WrappedID3D11Device::CreateCounter( } bool WrappedID3D11Device::Serialise_CreateDeferredContext( - /* [annotation] */ - __in const UINT ContextFlags, - /* [annotation] */ - __out_opt ID3D11DeviceContext **ppDeferredContext) + const UINT ContextFlags, + ID3D11DeviceContext **ppDeferredContext) { SERIALISE_ELEMENT(uint32_t, Flags, ContextFlags); SERIALISE_ELEMENT(ResourceId, Context, GetIDForResource(*ppDeferredContext)); @@ -2574,8 +2418,7 @@ bool WrappedID3D11Device::Serialise_CreateDeferredContext( HRESULT WrappedID3D11Device::CreateDeferredContext( UINT ContextFlags, - /* [annotation] */ - __out_opt ID3D11DeviceContext **ppDeferredContext) + ID3D11DeviceContext **ppDeferredContext) { // validation, returns S_FALSE for valid params, or an error code if(ppDeferredContext == NULL) return m_pDevice->CreateDeferredContext(ContextFlags, NULL); @@ -2609,12 +2452,9 @@ HRESULT WrappedID3D11Device::CreateDeferredContext( } bool WrappedID3D11Device::Serialise_OpenSharedResource( - /* [annotation] */ - __in HANDLE hResource, - /* [annotation] */ - __in REFIID ReturnedInterface, - /* [annotation] */ - __out_opt void **ppResource) + HANDLE hResource, + REFIID ReturnedInterface, + void **ppResource) { SERIALISE_ELEMENT(ResourceType, type, IdentifyTypeByPtr((IUnknown *)*ppResource)); SERIALISE_ELEMENT(ResourceId, pResource, GetIDForResource((ID3D11DeviceChild*)*ppResource)); @@ -2857,12 +2697,9 @@ bool WrappedID3D11Device::Serialise_OpenSharedResource( } HRESULT WrappedID3D11Device::OpenSharedResource( - /* [annotation] */ - __in HANDLE hResource, - /* [annotation] */ - __in REFIID ReturnedInterface, - /* [annotation] */ - __out_opt void **ppResource) + HANDLE hResource, + REFIID ReturnedInterface, + void **ppResource) { if(m_State < WRITING || ppResource == NULL) return E_INVALIDARG; @@ -2982,91 +2819,67 @@ HRESULT WrappedID3D11Device::OpenSharedResource( } HRESULT WrappedID3D11Device::CheckFormatSupport( - /* [annotation] */ - __in DXGI_FORMAT Format, - /* [annotation] */ - __out UINT *pFormatSupport) + DXGI_FORMAT Format, + UINT *pFormatSupport) { return m_pDevice->CheckFormatSupport(Format, pFormatSupport); } HRESULT WrappedID3D11Device::CheckMultisampleQualityLevels( - /* [annotation] */ - __in DXGI_FORMAT Format, - /* [annotation] */ - __in UINT SampleCount, - /* [annotation] */ - __out UINT *pNumQualityLevels) + DXGI_FORMAT Format, + UINT SampleCount, + UINT *pNumQualityLevels) { return m_pDevice->CheckMultisampleQualityLevels(Format, SampleCount, pNumQualityLevels); } void WrappedID3D11Device::CheckCounterInfo( - /* [annotation] */ - __out D3D11_COUNTER_INFO *pCounterInfo) + D3D11_COUNTER_INFO *pCounterInfo) { m_pDevice->CheckCounterInfo(pCounterInfo); } HRESULT WrappedID3D11Device::CheckCounter( - /* [annotation] */ - __in const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ - __out D3D11_COUNTER_TYPE *pType, - /* [annotation] */ - __out UINT *pActiveCounters, - /* [annotation] */ - __out_ecount_opt(*pNameLength) LPSTR szName, - /* [annotation] */ - __inout_opt UINT *pNameLength, - /* [annotation] */ - __out_ecount_opt(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ - __inout_opt UINT *pUnitsLength, - /* [annotation] */ - __out_ecount_opt(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ - __inout_opt UINT *pDescriptionLength) + const D3D11_COUNTER_DESC *pDesc, + D3D11_COUNTER_TYPE *pType, + UINT *pActiveCounters, + LPSTR szName, + UINT *pNameLength, + LPSTR szUnits, + UINT *pUnitsLength, + LPSTR szDescription, + UINT *pDescriptionLength) { return m_pDevice->CheckCounter(pDesc, pType, pActiveCounters, szName, pNameLength, szUnits, pUnitsLength, szDescription, pDescriptionLength); } HRESULT WrappedID3D11Device::CheckFeatureSupport( D3D11_FEATURE Feature, - /* [annotation] */ - __out_bcount(FeatureSupportDataSize) void *pFeatureSupportData, + void *pFeatureSupportData, UINT FeatureSupportDataSize) { return m_pDevice->CheckFeatureSupport(Feature, pFeatureSupportData, FeatureSupportDataSize); } HRESULT WrappedID3D11Device::GetPrivateData( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __inout UINT *pDataSize, - /* [annotation] */ - __out_bcount_opt(*pDataSize) void *pData) + REFGUID guid, + UINT *pDataSize, + void *pData) { return m_pDevice->GetPrivateData(guid, pDataSize, pData); } HRESULT WrappedID3D11Device::SetPrivateData( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __in UINT DataSize, - /* [annotation] */ - __in_bcount_opt(DataSize) const void *pData) + REFGUID guid, + UINT DataSize, + const void *pData) { return m_pDevice->SetPrivateData(guid, DataSize, pData); } HRESULT WrappedID3D11Device::SetPrivateDataInterface( - /* [annotation] */ - __in REFGUID guid, - /* [annotation] */ - __in_opt const IUnknown *pData) + REFGUID guid, + const IUnknown *pData) { return m_pDevice->SetPrivateDataInterface(guid, pData); } @@ -3087,8 +2900,7 @@ HRESULT WrappedID3D11Device::GetDeviceRemovedReason() } void WrappedID3D11Device::GetImmediateContext( - /* [annotation] */ - __out ID3D11DeviceContext **ppImmediateContext) + ID3D11DeviceContext **ppImmediateContext) { if(ppImmediateContext) { @@ -3129,4 +2941,4 @@ HRESULT WrappedID3D11Device::SetExceptionMode(UINT RaiseFlags) UINT WrappedID3D11Device::GetExceptionMode() { return m_pDevice->GetExceptionMode(); -} \ No newline at end of file +}