Upgrade SAL annotations in some source files (#197)
This commit is contained in:
Родитель
76d518d57d
Коммит
8c6ba6716b
|
@ -346,16 +346,16 @@ void SerializeRootSignature(const DxilVersionedRootSignatureDesc *pRootSignature
|
||||||
_Outptr_ IDxcBlob **ppBlob, _Outptr_ IDxcBlobEncoding **ppErrorBlob,
|
_Outptr_ IDxcBlob **ppBlob, _Outptr_ IDxcBlobEncoding **ppErrorBlob,
|
||||||
bool bAllowReservedRegisterSpace);
|
bool bAllowReservedRegisterSpace);
|
||||||
|
|
||||||
void DeserializeRootSignature(__in_bcount(SrcDataSizeInBytes) const void *pSrcData,
|
void DeserializeRootSignature(_In_reads_bytes_(SrcDataSizeInBytes) const void *pSrcData,
|
||||||
__in uint32_t SrcDataSizeInBytes,
|
_In_ uint32_t SrcDataSizeInBytes,
|
||||||
__out const DxilVersionedRootSignatureDesc **ppRootSignature);
|
_Out_ const DxilVersionedRootSignatureDesc **ppRootSignature);
|
||||||
|
|
||||||
// Takes PSV - pipeline state validation data, not shader container.
|
// Takes PSV - pipeline state validation data, not shader container.
|
||||||
bool VerifyRootSignatureWithShaderPSV(__in const DxilVersionedRootSignatureDesc *pDesc,
|
bool VerifyRootSignatureWithShaderPSV(_In_ const DxilVersionedRootSignatureDesc *pDesc,
|
||||||
__in DXIL::ShaderKind ShaderKind,
|
_In_ DXIL::ShaderKind ShaderKind,
|
||||||
_In_reads_bytes_(PSVSize) const void *pPSVData,
|
_In_reads_bytes_(PSVSize) const void *pPSVData,
|
||||||
__in uint32_t PSVSize,
|
_In_ uint32_t PSVSize,
|
||||||
__in llvm::raw_ostream &DiagStream);
|
_In_ llvm::raw_ostream &DiagStream);
|
||||||
|
|
||||||
} // namespace hlsl
|
} // namespace hlsl
|
||||||
|
|
||||||
|
|
|
@ -302,7 +302,7 @@ public:
|
||||||
STDMETHOD(IsOfType)(THIS_ ID3D12ShaderReflectionType* pType);
|
STDMETHOD(IsOfType)(THIS_ ID3D12ShaderReflectionType* pType);
|
||||||
STDMETHOD(ImplementsInterface)(THIS_ ID3D12ShaderReflectionType* pBase);
|
STDMETHOD(ImplementsInterface)(THIS_ ID3D12ShaderReflectionType* pBase);
|
||||||
|
|
||||||
bool CheckEqual(__in CShaderReflectionType *pOther) {
|
bool CheckEqual(_In_ CShaderReflectionType *pOther) {
|
||||||
return m_Identity == pOther->m_Identity;
|
return m_Identity == pOther->m_Identity;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -117,7 +117,7 @@ public:
|
||||||
HRESULT AddBlock(void *pData, unsigned cbSize, unsigned *pOffset);
|
HRESULT AddBlock(void *pData, unsigned cbSize, unsigned *pOffset);
|
||||||
HRESULT ReserveBlock(void **ppData, unsigned cbSize, unsigned *pOffset);
|
HRESULT ReserveBlock(void **ppData, unsigned cbSize, unsigned *pOffset);
|
||||||
|
|
||||||
HRESULT Compact(__out_bcount(cbSize) char *pData, unsigned cbSize);
|
HRESULT Compact(_Out_writes_bytes_(cbSize) char *pData, unsigned cbSize);
|
||||||
unsigned GetSize();
|
unsigned GetSize();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -205,7 +205,7 @@ Cleanup:
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT SimpleSerializer::Compact(__out_bcount(cbSize) char *pData,
|
HRESULT SimpleSerializer::Compact(_Out_writes_bytes_(cbSize) char *pData,
|
||||||
unsigned cbSize) {
|
unsigned cbSize) {
|
||||||
unsigned cb = GetSize();
|
unsigned cb = GetSize();
|
||||||
IFRBOOL(cb <= cbSize, E_FAIL);
|
IFRBOOL(cb <= cbSize, E_FAIL);
|
||||||
|
@ -1264,11 +1264,11 @@ template<typename T_ROOT_SIGNATURE_DESC,
|
||||||
typename T_ROOT_PARAMETER,
|
typename T_ROOT_PARAMETER,
|
||||||
typename T_ROOT_DESCRIPTOR_INTERNAL,
|
typename T_ROOT_DESCRIPTOR_INTERNAL,
|
||||||
typename T_DESCRIPTOR_RANGE_INTERNAL>
|
typename T_DESCRIPTOR_RANGE_INTERNAL>
|
||||||
void SerializeRootSignatureTemplate(__in const T_ROOT_SIGNATURE_DESC* pRootSignature,
|
void SerializeRootSignatureTemplate(_In_ const T_ROOT_SIGNATURE_DESC* pRootSignature,
|
||||||
DxilRootSignatureVersion DescVersion,
|
DxilRootSignatureVersion DescVersion,
|
||||||
_COM_Outptr_ IDxcBlob** ppBlob,
|
_COM_Outptr_ IDxcBlob** ppBlob,
|
||||||
DiagnosticPrinter &DiagPrinter,
|
DiagnosticPrinter &DiagPrinter,
|
||||||
__in bool bAllowReservedRegisterSpace) {
|
_In_ bool bAllowReservedRegisterSpace) {
|
||||||
DxilContainerRootSignatureDesc RS;
|
DxilContainerRootSignatureDesc RS;
|
||||||
uint32_t Offset;
|
uint32_t Offset;
|
||||||
SimpleSerializer Serializer;
|
SimpleSerializer Serializer;
|
||||||
|
@ -1423,8 +1423,8 @@ public:
|
||||||
CVersionedRootSignatureDeserializer();
|
CVersionedRootSignatureDeserializer();
|
||||||
~CVersionedRootSignatureDeserializer();
|
~CVersionedRootSignatureDeserializer();
|
||||||
|
|
||||||
void Initialize(__in_bcount(SrcDataSizeInBytes) const void *pSrcData,
|
void Initialize(_In_reads_bytes_(SrcDataSizeInBytes) const void *pSrcData,
|
||||||
__in uint32_t SrcDataSizeInBytes);
|
_In_ uint32_t SrcDataSizeInBytes);
|
||||||
|
|
||||||
const DxilVersionedRootSignatureDesc *GetRootSignatureDescAtVersion(DxilRootSignatureVersion convertToVersion);
|
const DxilVersionedRootSignatureDesc *GetRootSignatureDescAtVersion(DxilRootSignatureVersion convertToVersion);
|
||||||
|
|
||||||
|
@ -1442,8 +1442,8 @@ CVersionedRootSignatureDeserializer::~CVersionedRootSignatureDeserializer() {
|
||||||
DeleteRootSignature(m_pRootSignature11);
|
DeleteRootSignature(m_pRootSignature11);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CVersionedRootSignatureDeserializer::Initialize(__in_bcount(SrcDataSizeInBytes) const void *pSrcData,
|
void CVersionedRootSignatureDeserializer::Initialize(_In_reads_bytes_(SrcDataSizeInBytes) const void *pSrcData,
|
||||||
__in uint32_t SrcDataSizeInBytes) {
|
_In_ uint32_t SrcDataSizeInBytes) {
|
||||||
const DxilVersionedRootSignatureDesc *pRootSignature = nullptr;
|
const DxilVersionedRootSignatureDesc *pRootSignature = nullptr;
|
||||||
DeserializeRootSignature(pSrcData, SrcDataSizeInBytes, &pRootSignature);
|
DeserializeRootSignature(pSrcData, SrcDataSizeInBytes, &pRootSignature);
|
||||||
|
|
||||||
|
@ -1501,8 +1501,8 @@ template<typename T_ROOT_SIGNATURE_DESC,
|
||||||
typename T_ROOT_DESCRIPTOR_INTERNAL,
|
typename T_ROOT_DESCRIPTOR_INTERNAL,
|
||||||
typename T_DESCRIPTOR_RANGE,
|
typename T_DESCRIPTOR_RANGE,
|
||||||
typename T_DESCRIPTOR_RANGE_INTERNAL>
|
typename T_DESCRIPTOR_RANGE_INTERNAL>
|
||||||
void DeserializeRootSignatureTemplate(__in_bcount(SrcDataSizeInBytes) const void *pSrcData,
|
void DeserializeRootSignatureTemplate(_In_reads_bytes_(SrcDataSizeInBytes) const void *pSrcData,
|
||||||
__in uint32_t SrcDataSizeInBytes,
|
_In_ uint32_t SrcDataSizeInBytes,
|
||||||
DxilRootSignatureVersion DescVersion,
|
DxilRootSignatureVersion DescVersion,
|
||||||
T_ROOT_SIGNATURE_DESC &RootSignatureDesc) {
|
T_ROOT_SIGNATURE_DESC &RootSignatureDesc) {
|
||||||
// Note that in case of failure, outside code must deallocate memory.
|
// Note that in case of failure, outside code must deallocate memory.
|
||||||
|
|
|
@ -4428,7 +4428,7 @@ FunctionDecl* HLSLExternalSource::AddSubscriptSpecialization(
|
||||||
/// and want to treat either side equally you should call it twice, swapping the
|
/// and want to treat either side equally you should call it twice, swapping the
|
||||||
/// parameter order.
|
/// parameter order.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
static bool CombineObjectTypes(ArBasicKind Target, __in ArBasicKind Source,
|
static bool CombineObjectTypes(ArBasicKind Target, _In_ ArBasicKind Source,
|
||||||
_Out_opt_ ArBasicKind *pCombined) {
|
_Out_opt_ ArBasicKind *pCombined) {
|
||||||
if (Target == Source) {
|
if (Target == Source) {
|
||||||
AssignOpt(Target, pCombined);
|
AssignOpt(Target, pCombined);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче