Misaki
d91d6f6e57
- Added `generatedCodePath` to `FullPassDescriptor` for better shader code organization. - Removed redundant `IID_PPV_ARGS` method and unused `Misaki.HighPerformance.Unsafe` reference. - Refactored `Material` and `MaterialAccessor` to use `CBuffer` and updated buffer size handling. - Renamed command buffer variables in `RenderingContext` for consistency. - Updated `D3D12PipelineLibrary` to cache compiled shader results and added `ShaderPassKey`. - Refactored `D3D12GraphicsEngine` to integrate `_copyCommandBuffer` lifecycle. - Enhanced `D3D12ResourceAllocator` with shader pass creation using constant buffer info. - Simplified `D3D12ShaderCompiler` with `GENERATED_CODE_PATH` support and improved reflection handling. - Introduced `CBufferPropertyInfo` and `CBufferInfo` structs for better encapsulation. - Updated HLSL shaders to use `g_PerMaterialData` and dynamic includes. - Improved error handling in `SDLCompiler` with try-catch blocks and better messages. - Refactored `test.gshader` to use dynamically generated includes. - Fixed typos, improved code readability, and removed unused code.
98 lines
3.3 KiB
HLSL
98 lines
3.3 KiB
HLSL
#ifndef COMMON_HLSL
|
|
#define COMMON_HLSL
|
|
|
|
#undef USE_TRADITIONAL_BINDLESS // Just for testing, this should be handled by engine feature level.
|
|
|
|
|
|
// Resource descriptor heap definitions
|
|
|
|
#if defined(USE_TRADITIONAL_BINDLESS)
|
|
#define GLOBAL_TEXTURE2D_HEAP_SIZE 32768
|
|
#define GLOBAL_TEXTURE3D_HEAP_SIZE 32
|
|
#define GLOBAL_TEXTURECUBE_HEAP_SIZE 32
|
|
#define GLOBAL_TEXTURE2D_ARRAY_HEAP_SIZE 256
|
|
#define GLOBAL_TEXTURECUBE_ARRAY_HEAP_SIZE 32
|
|
#define GLOBAL_SAMPLER_HEAP_SIZE 32
|
|
|
|
#define GLOBAL_TEXTURE2D_HEAP GlobalTexture2DHeap
|
|
#define GLOBAL_TEXTURE3D_HEAP GlobalTexture3DHeap
|
|
#define GLOBAL_TEXTURECUBE_HEAP GlobalTextureCubeHeap
|
|
#define GLOBAL_TEXTURE2D_ARRAY_HEAP GlobalTexture2DArrayHeap
|
|
#define GLOBAL_TEXTURECUBE_ARRAY_HEAP GlobalTextureCubeArrayHeap
|
|
#define GLOBAL_SAMPLER_HEAP GlobalSamplerHeap
|
|
#else
|
|
#define GLOBAL_TEXTURE2D_HEAP ResourceDescriptorHeap
|
|
#define GLOBAL_TEXTURE3D_HEAP ResourceDescriptorHeap
|
|
#define GLOBAL_TEXTURECUBE_HEAP ResourceDescriptorHeap
|
|
#define GLOBAL_TEXTURE2D_ARRAY_HEAP ResourceDescriptorHeap
|
|
#define GLOBAL_TEXTURECUBE_ARRAY_HEAP ResourceDescriptorHeap
|
|
#define GLOBAL_SAMPLER_HEAP SamplerDescriptorHeap
|
|
#endif
|
|
|
|
|
|
// Bindless resource type definitions
|
|
|
|
#define TEXTURE2D_BINDLESS uint
|
|
#define TEXTURE3D_BINDLESS uint
|
|
#define TEXTURECUBE_BINDLESS uint
|
|
#define TEXTURE2D_ARRAY_BINDLESS uint
|
|
#define TEXTURECUBE_ARRAY_BINDLESS uint
|
|
|
|
#define SAMPLER_BINDLESS uint
|
|
|
|
#define STRUCT_BUFFER_BINDLESS uint
|
|
#define BYTE_ADDRESS_BUFFER_BINDLESS uint
|
|
|
|
#define TEXTURE2D Texture2D
|
|
#define TEXTURE3D Texture3D
|
|
#define TEXTURECUBE TextureCube
|
|
#define TEXTURE2D_ARRAY Texture2DArray
|
|
#define TEXTURECUBE_ARRAY TextureCubeArray
|
|
|
|
#define SAMPLER SamplerState
|
|
|
|
#define STRUCT_BUFFER(type) StructuredBuffer<type>
|
|
#define BYTE_ADDRESS_BUFFER ByteAddressBuffer
|
|
|
|
|
|
// Texture and sampler access macros
|
|
|
|
#define GET_TEXTURE2D_BINDLESS(id) GLOBAL_TEXTURE2D_HEAP[id]
|
|
#define GET_TEXTURE2D_ARRAY_BINDLESS(id) GLOBAL_TEXTURE2D_ARRAY_HEAP[id]
|
|
#define GET_TEXTURE3D_BINDLESS(id) GLOBAL_TEXTURE3D_HEAP[id]
|
|
#define GET_TEXTURECUBE_BINDLESS(id) GLOBAL_TEXTURECUBE_HEAP[id]
|
|
#define GET_TEXTURECUBE_ARRAY_BINDLESS(id) GLOBAL_TEXTURECUBE_ARRAY_HEAP[id]
|
|
#define GET_SAMPLER_BINDLESS(id) GLOBAL_SAMPLER_HEAP[id]
|
|
|
|
|
|
// Texture sampling macros
|
|
|
|
#define SAMPLE_TEXTURE2D(tex, samp, uv) tex.Sample(samp, uv)
|
|
#define SAMPLE_TEXTURE2D_LEVEL(tex, samp, uv, level) tex.SampleLevel(samp, uv, level)
|
|
#define SAMPLE_TEXTURE2D_BINDLESS(texId, sampId, uv) SampleTexture2DBindless(texId, sampId, uv)
|
|
#define SAMPLE_TEXTURE2D_LEVEL_BINDLESS(texId, sampId, uv, level) SampleTexture2DLevelBindless(texId, sampId, uv, level)
|
|
|
|
#define SAMPLE_TEXTURE2D_ARRAY(tex, samp, uv, index) tex.Sample(samp, uv, index)
|
|
#define SAMPLE_TEXTURE2D_ARRAY_BINDLESS(texId, sampId, uv, index) GET_TEXTURE2D_ARRAY_BINDLESS(texId).Sample(GET_SAMPLER_BINDLESS(sampId), uv, index)
|
|
|
|
static inline float4 SampleTexture2DBindless(uint texId, uint sampId, float2 uv)
|
|
{
|
|
Texture2D tex = GET_TEXTURE2D_BINDLESS(texId);
|
|
SamplerState samp = GET_SAMPLER_BINDLESS(sampId);
|
|
return tex.Sample(samp, uv);
|
|
}
|
|
|
|
static inline float4 SampleTexture2DLevelBindless(uint texId, uint sampId, float2 uv, float level)
|
|
{
|
|
Texture2D tex = GET_TEXTURE2D_BINDLESS(texId);
|
|
SamplerState samp = GET_SAMPLER_BINDLESS(sampId);
|
|
return tex.SampleLevel(samp, uv, level);
|
|
}
|
|
|
|
|
|
|
|
|
|
#define MESH_SHADER_THREADS(x) [NumThreads(x, 1, 1)]
|
|
|
|
#endif // COMMON_HLSL
|