Avoid extra dependencies in the DxilRuntimeReflection header. NFC (#5645)

including `WinIncludes.h` here pulls in a bunch of dependencies like ATL
even though we really don't need those in this header. Given that the
only things we're using that include for is to use LPCWSTR and LPCVOID
spellings in a way that works on both windows and unix, just expand
those macros to their definitions instead.
This commit is contained in:
Justin Bogner 2023-09-01 14:36:50 -07:00 коммит произвёл GitHub
Родитель babb2378e6
Коммит 1a3c179775
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 11 добавлений и 12 удалений

Просмотреть файл

@ -12,7 +12,6 @@
#pragma once
#include "dxc/DXIL/DxilConstants.h"
#include "dxc/Support/WinIncludes.h"
#define RDAT_NULL_REF ((uint32_t)0xFFFFFFFF)
@ -634,19 +633,19 @@ struct DxilResourceDesc {
uint32_t Space;
uint32_t UpperBound;
uint32_t LowerBound;
LPCWSTR Name;
const wchar_t *Name;
uint32_t Flags; // hlsl::RDAT::DxilResourceFlag
};
typedef const DxilResourceDesc *const *DxilResourceDescPtrArray;
struct DxilFunctionDesc {
LPCWSTR Name;
LPCWSTR UnmangledName;
const wchar_t *Name;
const wchar_t *UnmangledName;
uint32_t NumResources;
uint32_t NumFunctionDependencies;
DxilResourceDescPtrArray Resources;
const LPCWSTR *FunctionDependencies;
const wchar_t *const *FunctionDependencies;
DXIL::ShaderKind ShaderKind;
uint32_t PayloadSizeInBytes; // 1) hit, miss, or closest shader: payload count
// 2) call shader: parameter size
@ -658,20 +657,20 @@ struct DxilFunctionDesc {
};
struct DxilSubobjectDesc {
LPCWSTR Name;
const wchar_t *Name;
DXIL::SubobjectKind Kind; // D3D12_STATE_SUBOBJECT_TYPE
struct StateObjectConfig_t {
uint32_t Flags; // DXIL::StateObjectFlags / D3D12_STATE_OBJECT_FLAGS
};
struct RootSignature_t {
LPCVOID pSerializedSignature;
const void *pSerializedSignature;
uint32_t SizeInBytes;
}; // GlobalRootSignature or LocalRootSignature
struct SubobjectToExportsAssociation_t {
LPCWSTR Subobject;
const wchar_t *Subobject;
uint32_t NumExports;
const LPCWSTR* Exports;
const wchar_t *const *Exports;
};
struct RaytracingShaderConfig_t {
uint32_t MaxPayloadSizeInBytes;
@ -682,9 +681,9 @@ struct DxilSubobjectDesc {
};
struct HitGroup_t {
DXIL::HitGroupType Type; // D3D12_HIT_GROUP_TYPE
LPCWSTR AnyHit;
LPCWSTR ClosestHit;
LPCWSTR Intersection;
const wchar_t *AnyHit;
const wchar_t *ClosestHit;
const wchar_t *Intersection;
};
struct RaytracingPipelineConfig1_t {