feat: modules moved and engine moved to submodule
This commit is contained in:
Jan van der Weide
parent
dfb5e645cd
commit
c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
|
|
@ -15,15 +15,15 @@ thirdparty_obj = []
|
|||
|
||||
# DirectX Headers (must take precedence over Windows SDK's).
|
||||
|
||||
env.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
|
||||
env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
|
||||
env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/dxguids"])
|
||||
env.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/directx"])
|
||||
env_d3d12_rdd.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/directx"])
|
||||
env_d3d12_rdd.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/dxguids"])
|
||||
|
||||
|
||||
# Direct3D 12 Memory Allocator.
|
||||
|
||||
env.Append(CPPPATH=["#thirdparty/d3d12ma"])
|
||||
env_d3d12_rdd.Append(CPPPATH=["#thirdparty/d3d12ma"])
|
||||
env.Append(CPPEXTPATH=["#thirdparty/d3d12ma"])
|
||||
env_d3d12_rdd.Append(CPPEXTPATH=["#thirdparty/d3d12ma"])
|
||||
|
||||
|
||||
# Agility SDK.
|
||||
|
|
@ -38,7 +38,7 @@ if env["agility_sdk_path"] != "" and os.path.exists(env["agility_sdk_path"]):
|
|||
|
||||
if env["use_pix"]:
|
||||
env_d3d12_rdd.Append(CPPDEFINES=["PIX_ENABLED"])
|
||||
env_d3d12_rdd.Append(CPPPATH=[env["pix_path"] + "/Include"])
|
||||
env_d3d12_rdd.Append(CPPEXTPATH=[env["pix_path"] + "/Include"])
|
||||
|
||||
|
||||
# Mesa (SPIR-V to DXIL functionality).
|
||||
|
|
@ -147,7 +147,7 @@ else:
|
|||
env.Append(CCFLAGS=["-Wno-unknown-pragmas"])
|
||||
|
||||
# This is needed since rendering_device_d3d12.cpp needs to include some Mesa internals.
|
||||
env_d3d12_rdd.Prepend(CPPPATH=mesa_private_inc_paths)
|
||||
env_d3d12_rdd.Prepend(CPPEXTPATH=mesa_private_inc_paths)
|
||||
# For the same reason as above, the defines must be the same as in the 3rd-party code itself.
|
||||
env_d3d12_rdd.Append(CPPDEFINES=extra_defines)
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef D3D12_GODOT_NIR_BRIDGE_H
|
||||
#define D3D12_GODOT_NIR_BRIDGE_H
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
|
|
@ -56,5 +55,3 @@ typedef struct GodotNirCallbacks {
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // D3D12_GODOT_NIR_BRIDGE_H
|
||||
|
|
|
|||
|
|
@ -30,35 +30,4 @@
|
|||
|
||||
#include "rendering_context_driver_d3d12.h"
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wswitch"
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma GCC diagnostic ignored "-Wduplicated-branches"
|
||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||
#pragma GCC diagnostic ignored "-Wnonnull-compare"
|
||||
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||
#pragma clang diagnostic ignored "-Wswitch"
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma clang diagnostic ignored "-Wtautological-undefined-compare"
|
||||
#pragma clang diagnostic ignored "-Wunused-variable"
|
||||
#pragma clang diagnostic ignored "-Wunused-but-set-variable"
|
||||
#pragma clang diagnostic ignored "-Wunused-function"
|
||||
#pragma clang diagnostic ignored "-Wunused-private-field"
|
||||
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(disable : 4189 4505)
|
||||
#endif
|
||||
|
||||
#include "thirdparty/d3d12ma/D3D12MemAlloc.cpp"
|
||||
#include <D3D12MemAlloc.cpp>
|
||||
|
|
|
|||
|
|
@ -28,12 +28,9 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef DXIL_HASH_H
|
||||
#define DXIL_HASH_H
|
||||
#pragma once
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
||||
void compute_dxil_hash(const BYTE *pData, UINT byteCount, BYTE *pOutHash);
|
||||
|
||||
#endif // DXIL_HASH_H
|
||||
|
|
|
|||
|
|
@ -37,27 +37,7 @@
|
|||
#include "core/version.h"
|
||||
#include "servers/rendering/rendering_device.h"
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wswitch"
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||
#pragma clang diagnostic ignored "-Wswitch"
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
#endif
|
||||
|
||||
#include "dxcapi.h"
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
#include <dxcapi.h>
|
||||
|
||||
#if !defined(_MSC_VER)
|
||||
#include <guiddef.h>
|
||||
|
|
|
|||
|
|
@ -28,10 +28,8 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef RENDERING_CONTEXT_DRIVER_D3D12_H
|
||||
#define RENDERING_CONTEXT_DRIVER_D3D12_H
|
||||
#pragma once
|
||||
|
||||
#include "core/error/error_list.h"
|
||||
#include "core/os/mutex.h"
|
||||
#include "core/string/ustring.h"
|
||||
#include "core/templates/rid_owner.h"
|
||||
|
|
@ -39,22 +37,6 @@
|
|||
#include "servers/display_server.h"
|
||||
#include "servers/rendering/rendering_context_driver.h"
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wswitch"
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||
#pragma clang diagnostic ignored "-Wswitch"
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#endif
|
||||
|
||||
#if defined(AS)
|
||||
#undef AS
|
||||
#endif
|
||||
|
|
@ -73,20 +55,14 @@
|
|||
#include <dcomp.h>
|
||||
#endif
|
||||
|
||||
#include "d3dx12.h"
|
||||
#include <d3dx12.h>
|
||||
#include <dxgi1_6.h>
|
||||
|
||||
#include <wrl/client.h>
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
using Microsoft::WRL::ComPtr;
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
||||
#define ARRAY_SIZE(a) std::size(a)
|
||||
|
||||
class RenderingContextDriverD3D12 : public RenderingContextDriver {
|
||||
ComPtr<ID3D12DeviceFactory> device_factory;
|
||||
|
|
@ -146,5 +122,3 @@ public:
|
|||
RenderingContextDriverD3D12();
|
||||
virtual ~RenderingContextDriverD3D12() override;
|
||||
};
|
||||
|
||||
#endif // RENDERING_CONTEXT_DRIVER_D3D12_H
|
||||
|
|
|
|||
|
|
@ -39,44 +39,13 @@
|
|||
#include "dxil_hash.h"
|
||||
#include "rendering_context_driver_d3d12.h"
|
||||
|
||||
// No point in fighting warnings in Mesa.
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4200) // "nonstandard extension used: zero-sized array in struct/union".
|
||||
#pragma warning(disable : 4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wswitch"
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||
#pragma clang diagnostic ignored "-Wswitch"
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
#endif
|
||||
|
||||
#include "nir_spirv.h"
|
||||
#include "nir_to_dxil.h"
|
||||
#include "spirv_to_dxil.h"
|
||||
#include <nir_spirv.h>
|
||||
#include <nir_to_dxil.h>
|
||||
#include <spirv_to_dxil.h>
|
||||
extern "C" {
|
||||
#include "dxil_spirv_nir.h"
|
||||
#include <dxil_spirv_nir.h>
|
||||
}
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#if !defined(_MSC_VER)
|
||||
#include <guiddef.h>
|
||||
|
||||
|
|
@ -332,6 +301,20 @@ const RenderingDeviceDriverD3D12::D3D12Format RenderingDeviceDriverD3D12::RD_TO_
|
|||
/* DATA_FORMAT_G16_B16_R16_3PLANE_422_UNORM */ {},
|
||||
/* DATA_FORMAT_G16_B16R16_2PLANE_422_UNORM */ {},
|
||||
/* DATA_FORMAT_G16_B16_R16_3PLANE_444_UNORM */ {},
|
||||
/* DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK*/ {},
|
||||
/* DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK */ {},
|
||||
/* DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK */ {},
|
||||
};
|
||||
|
||||
Error RenderingDeviceDriverD3D12::DescriptorsHeap::allocate(ID3D12Device *p_device, D3D12_DESCRIPTOR_HEAP_TYPE p_type, uint32_t p_descriptor_count, bool p_for_gpu) {
|
||||
|
|
@ -1208,7 +1191,7 @@ RDD::TextureID RenderingDeviceDriverD3D12::texture_create(const TextureFormat &p
|
|||
if ((p_format.usage_bits & TEXTURE_USAGE_STORAGE_BIT)) {
|
||||
resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
|
||||
}
|
||||
if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
|
||||
if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && (p_format.usage_bits & TEXTURE_USAGE_VRS_FRAGMENT_SHADING_RATE_BIT)) {
|
||||
// For VRS images we can't use the typeless format.
|
||||
resource_desc.Format = DXGI_FORMAT_R8_UINT;
|
||||
}
|
||||
|
|
@ -1353,14 +1336,9 @@ RDD::TextureID RenderingDeviceDriverD3D12::texture_create(const TextureFormat &p
|
|||
}
|
||||
tex_info->states_ptr = &tex_info->owner_info.states;
|
||||
tex_info->format = p_format.format;
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
|
||||
#endif
|
||||
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wstrict-aliasing")
|
||||
tex_info->desc = *(CD3DX12_RESOURCE_DESC *)&resource_desc;
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
GODOT_GCC_WARNING_POP
|
||||
tex_info->base_layer = 0;
|
||||
tex_info->layers = resource_desc.ArraySize();
|
||||
tex_info->base_mip = 0;
|
||||
|
|
@ -1813,8 +1791,11 @@ static D3D12_BARRIER_ACCESS _rd_texture_layout_access_mask(RDD::TextureLayout p_
|
|||
return D3D12_BARRIER_ACCESS_RESOLVE_SOURCE;
|
||||
case RDD::TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL:
|
||||
return D3D12_BARRIER_ACCESS_RESOLVE_DEST;
|
||||
case RDD::TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL:
|
||||
case RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL:
|
||||
return D3D12_BARRIER_ACCESS_SHADING_RATE_SOURCE;
|
||||
case RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL:
|
||||
DEV_ASSERT(false && "Fragment density maps are not supported in D3D12.");
|
||||
return D3D12_BARRIER_ACCESS_NO_ACCESS;
|
||||
default:
|
||||
return D3D12_BARRIER_ACCESS_NO_ACCESS;
|
||||
}
|
||||
|
|
@ -1933,7 +1914,7 @@ static void _rd_stages_to_d3d12(BitField<RDD::PipelineStageBits> p_stages, D3D12
|
|||
r_sync |= D3D12_BARRIER_SYNC_VERTEX_SHADING;
|
||||
}
|
||||
|
||||
if (p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT)) {
|
||||
if (p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT) || p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT)) {
|
||||
r_sync |= D3D12_BARRIER_SYNC_PIXEL_SHADING;
|
||||
}
|
||||
|
||||
|
|
@ -2028,8 +2009,11 @@ static D3D12_BARRIER_LAYOUT _rd_texture_layout_to_d3d12_barrier_layout(RDD::Text
|
|||
return D3D12_BARRIER_LAYOUT_RESOLVE_SOURCE;
|
||||
case RDD::TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL:
|
||||
return D3D12_BARRIER_LAYOUT_RESOLVE_DEST;
|
||||
case RDD::TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL:
|
||||
case RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL:
|
||||
return D3D12_BARRIER_LAYOUT_SHADING_RATE_SOURCE;
|
||||
case RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL:
|
||||
DEV_ASSERT(false && "Fragment density maps are not supported in D3D12.");
|
||||
return D3D12_BARRIER_LAYOUT_UNDEFINED;
|
||||
default:
|
||||
DEV_ASSERT(false && "Unknown texture layout.");
|
||||
return D3D12_BARRIER_LAYOUT_UNDEFINED;
|
||||
|
|
@ -2437,7 +2421,7 @@ RDD::SwapChainID RenderingDeviceDriverD3D12::swap_chain_create(RenderingContextD
|
|||
color_ref.aspect.set_flag(RDD::TEXTURE_ASPECT_COLOR_BIT);
|
||||
subpass.color_references.push_back(color_ref);
|
||||
|
||||
RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1);
|
||||
RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1, AttachmentReference());
|
||||
ERR_FAIL_COND_V(!render_pass, SwapChainID());
|
||||
|
||||
// Create the empty swap chain until it is resized.
|
||||
|
|
@ -2797,8 +2781,8 @@ RDD::FramebufferID RenderingDeviceDriverD3D12::_framebuffer_create(RenderPassID
|
|||
|
||||
uint32_t vrs_index = UINT32_MAX;
|
||||
for (const Subpass &E : pass_info->subpasses) {
|
||||
if (E.vrs_reference.attachment != AttachmentReference::UNUSED) {
|
||||
vrs_index = E.vrs_reference.attachment;
|
||||
if (E.fragment_shading_rate_reference.attachment != AttachmentReference::UNUSED) {
|
||||
vrs_index = E.fragment_shading_rate_reference.attachment;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3074,7 +3058,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
|
|||
|
||||
// Translate SPIR-V shaders to DXIL, and collect shader info from the new representation.
|
||||
HashMap<ShaderStage, Vector<uint8_t>> dxil_blobs;
|
||||
BitField<ShaderStage> stages_processed;
|
||||
BitField<ShaderStage> stages_processed = {};
|
||||
{
|
||||
HashMap<int, nir_shader *> stages_nir_shaders;
|
||||
|
||||
|
|
@ -3529,7 +3513,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
|
|||
ComPtr<ID3DBlob> error_blob;
|
||||
HRESULT res = D3DX12SerializeVersionedRootSignature(context_driver->lib_d3d12, &root_sig_desc, D3D_ROOT_SIGNATURE_VERSION_1_1, root_sig_blob.GetAddressOf(), error_blob.GetAddressOf());
|
||||
ERR_FAIL_COND_V_MSG(!SUCCEEDED(res), Vector<uint8_t>(),
|
||||
"Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize()));
|
||||
"Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String::ascii(Span((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize())));
|
||||
|
||||
binary_data.root_signature_crc = crc32(0, nullptr, 0);
|
||||
binary_data.root_signature_crc = crc32(binary_data.root_signature_crc, (const Bytef *)root_sig_blob->GetBufferPointer(), root_sig_blob->GetBufferSize());
|
||||
|
|
@ -3677,7 +3661,8 @@ RDD::ShaderID RenderingDeviceDriverD3D12::shader_create_from_bytecode(const Vect
|
|||
read_offset += sizeof(uint32_t) * 3 + bin_data_size;
|
||||
|
||||
if (binary_data.shader_name_len) {
|
||||
r_name.parse_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
|
||||
r_name.clear();
|
||||
r_name.append_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
|
||||
read_offset += STEPIFY(binary_data.shader_name_len, 4);
|
||||
}
|
||||
|
||||
|
|
@ -4949,7 +4934,9 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::pipeline_cache_serialize() {
|
|||
|
||||
// ----- SUBPASS -----
|
||||
|
||||
RDD::RenderPassID RenderingDeviceDriverD3D12::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) {
|
||||
RDD::RenderPassID RenderingDeviceDriverD3D12::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) {
|
||||
ERR_FAIL_COND_V_MSG(p_fragment_density_map_attachment.attachment != AttachmentReference::UNUSED, RenderPassID(), "Fragment density maps are not supported in D3D12.");
|
||||
|
||||
// Pre-bookkeep.
|
||||
RenderPassInfo *pass_info = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
|
||||
|
||||
|
|
@ -5050,7 +5037,7 @@ void RenderingDeviceDriverD3D12::command_begin_render_pass(CommandBufferID p_cmd
|
|||
}
|
||||
}
|
||||
|
||||
if (fb_info->vrs_attachment && vrs_capabilities.ss_image_supported) {
|
||||
if (fb_info->vrs_attachment && fsr_capabilities.attachment_supported) {
|
||||
ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
|
||||
cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
|
||||
if (cmd_list_5) {
|
||||
|
|
@ -5170,7 +5157,7 @@ void RenderingDeviceDriverD3D12::command_end_render_pass(CommandBufferID p_cmd_b
|
|||
const FramebufferInfo *fb_info = cmd_buf_info->render_pass_state.fb_info;
|
||||
const RenderPassInfo *pass_info = cmd_buf_info->render_pass_state.pass_info;
|
||||
|
||||
if (vrs_capabilities.ss_image_supported) {
|
||||
if (fsr_capabilities.attachment_supported) {
|
||||
ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
|
||||
cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
|
||||
if (cmd_list_5) {
|
||||
|
|
@ -6218,6 +6205,8 @@ uint64_t RenderingDeviceDriverD3D12::limit_get(Limit p_limit) {
|
|||
return D3D12_CS_THREAD_GROUP_MAX_Y;
|
||||
case LIMIT_MAX_COMPUTE_WORKGROUP_SIZE_Z:
|
||||
return D3D12_CS_THREAD_GROUP_MAX_Z;
|
||||
case LIMIT_MAX_COMPUTE_SHARED_MEMORY_SIZE:
|
||||
return D3D12_CS_TGSM_REGISTER_COUNT * sizeof(float);
|
||||
case LIMIT_SUBGROUP_SIZE:
|
||||
// Note in min/max. Shader model 6.6 supports it (see https://microsoft.github.io/DirectX-Specs/d3d/HLSL_SM_6_6_WaveSize.html),
|
||||
// but at this time I don't know the implications on the transpilation to DXIL, etc.
|
||||
|
|
@ -6228,12 +6217,6 @@ uint64_t RenderingDeviceDriverD3D12::limit_get(Limit p_limit) {
|
|||
return subgroup_capabilities.supported_stages_flags_rd();
|
||||
case LIMIT_SUBGROUP_OPERATIONS:
|
||||
return subgroup_capabilities.supported_operations_flags_rd();
|
||||
case LIMIT_VRS_TEXEL_WIDTH:
|
||||
case LIMIT_VRS_TEXEL_HEIGHT:
|
||||
return vrs_capabilities.ss_image_tile_size;
|
||||
case LIMIT_VRS_MAX_FRAGMENT_WIDTH:
|
||||
case LIMIT_VRS_MAX_FRAGMENT_HEIGHT:
|
||||
return vrs_capabilities.ss_max_fragment_size;
|
||||
case LIMIT_MAX_SHADER_VARYINGS:
|
||||
return MIN(D3D12_VS_OUTPUT_REGISTER_COUNT, D3D12_PS_INPUT_REGISTER_COUNT);
|
||||
default: {
|
||||
|
|
@ -6270,12 +6253,8 @@ uint64_t RenderingDeviceDriverD3D12::api_trait_get(ApiTrait p_trait) {
|
|||
|
||||
bool RenderingDeviceDriverD3D12::has_feature(Features p_feature) {
|
||||
switch (p_feature) {
|
||||
case SUPPORTS_MULTIVIEW:
|
||||
return multiview_capabilities.is_supported && multiview_capabilities.max_view_count > 1;
|
||||
case SUPPORTS_FSR_HALF_FLOAT:
|
||||
return shader_capabilities.native_16bit_ops && storage_buffer_capabilities.storage_buffer_16_bit_access_is_supported;
|
||||
case SUPPORTS_ATTACHMENT_VRS:
|
||||
return vrs_capabilities.ss_image_supported;
|
||||
case SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS:
|
||||
return true;
|
||||
case SUPPORTS_BUFFER_DEVICE_ADDRESS:
|
||||
|
|
@ -6289,6 +6268,14 @@ const RDD::MultiviewCapabilities &RenderingDeviceDriverD3D12::get_multiview_capa
|
|||
return multiview_capabilities;
|
||||
}
|
||||
|
||||
const RDD::FragmentShadingRateCapabilities &RenderingDeviceDriverD3D12::get_fragment_shading_rate_capabilities() {
|
||||
return fsr_capabilities;
|
||||
}
|
||||
|
||||
const RDD::FragmentDensityMapCapabilities &RenderingDeviceDriverD3D12::get_fragment_density_map_capabilities() {
|
||||
return fdm_capabilities;
|
||||
}
|
||||
|
||||
String RenderingDeviceDriverD3D12::get_api_name() const {
|
||||
return "D3D12";
|
||||
}
|
||||
|
|
@ -6450,12 +6437,6 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
|
|||
device_capabilities.version_minor = feature_level % 10;
|
||||
|
||||
// Assume not supported until proven otherwise.
|
||||
vrs_capabilities.draw_call_supported = false;
|
||||
vrs_capabilities.primitive_supported = false;
|
||||
vrs_capabilities.primitive_in_multiviewport = false;
|
||||
vrs_capabilities.ss_image_supported = false;
|
||||
vrs_capabilities.ss_image_tile_size = 1;
|
||||
vrs_capabilities.additional_rates_supported = false;
|
||||
multiview_capabilities.is_supported = false;
|
||||
multiview_capabilities.geometry_shader_is_supported = false;
|
||||
multiview_capabilities.tessellation_shader_is_supported = false;
|
||||
|
|
@ -6546,14 +6527,12 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
|
|||
res = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS6, &options6, sizeof(options6));
|
||||
if (SUCCEEDED(res)) {
|
||||
if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_1) {
|
||||
vrs_capabilities.draw_call_supported = true;
|
||||
fsr_capabilities.pipeline_supported = true;
|
||||
if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_2) {
|
||||
vrs_capabilities.primitive_supported = true;
|
||||
vrs_capabilities.primitive_in_multiviewport = options6.PerPrimitiveShadingRateSupportedWithViewportIndexing;
|
||||
vrs_capabilities.ss_image_supported = true;
|
||||
vrs_capabilities.ss_image_tile_size = options6.ShadingRateImageTileSize;
|
||||
vrs_capabilities.ss_max_fragment_size = 8; // TODO figure out if this is supplied and/or needed
|
||||
vrs_capabilities.additional_rates_supported = options6.AdditionalShadingRatesSupported;
|
||||
fsr_capabilities.primitive_supported = true;
|
||||
fsr_capabilities.attachment_supported = true;
|
||||
fsr_capabilities.min_texel_size = Size2i(options6.ShadingRateImageTileSize, options6.ShadingRateImageTileSize);
|
||||
fsr_capabilities.max_texel_size = Size2i(8, 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6565,19 +6544,16 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
|
|||
barrier_capabilities.enhanced_barriers_supported = options12.EnhancedBarriersSupported;
|
||||
}
|
||||
|
||||
if (vrs_capabilities.draw_call_supported || vrs_capabilities.primitive_supported || vrs_capabilities.ss_image_supported) {
|
||||
if (fsr_capabilities.pipeline_supported || fsr_capabilities.primitive_supported || fsr_capabilities.attachment_supported) {
|
||||
print_verbose("- D3D12 Variable Rate Shading supported:");
|
||||
if (vrs_capabilities.draw_call_supported) {
|
||||
if (fsr_capabilities.pipeline_supported) {
|
||||
print_verbose(" Draw call");
|
||||
}
|
||||
if (vrs_capabilities.primitive_supported) {
|
||||
print_verbose(String(" Per-primitive (multi-viewport: ") + (vrs_capabilities.primitive_in_multiviewport ? "yes" : "no") + ")");
|
||||
if (fsr_capabilities.primitive_supported) {
|
||||
print_verbose(" Primitive");
|
||||
}
|
||||
if (vrs_capabilities.ss_image_supported) {
|
||||
print_verbose(String(" Screen-space image (tile size: ") + itos(vrs_capabilities.ss_image_tile_size) + ")");
|
||||
}
|
||||
if (vrs_capabilities.additional_rates_supported) {
|
||||
print_verbose(String(" Additional rates: ") + (vrs_capabilities.additional_rates_supported ? "yes" : "no"));
|
||||
if (fsr_capabilities.attachment_supported) {
|
||||
print_verbose(String(" Screen-space image (tile size: ") + itos(fsr_capabilities.min_texel_size.x) + ")");
|
||||
}
|
||||
} else {
|
||||
print_verbose("- D3D12 Variable Rate Shading not supported");
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef RENDERING_DEVICE_DRIVER_D3D12_H
|
||||
#define RENDERING_DEVICE_DRIVER_D3D12_H
|
||||
#pragma once
|
||||
|
||||
#include "core/templates/hash_map.h"
|
||||
#include "core/templates/paged_allocator.h"
|
||||
|
|
@ -41,26 +40,10 @@
|
|||
#define __REQUIRED_RPCNDR_H_VERSION__ 475
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma GCC diagnostic ignored "-Wshadow"
|
||||
#pragma GCC diagnostic ignored "-Wswitch"
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||
#pragma clang diagnostic ignored "-Wswitch"
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#endif
|
||||
|
||||
#include "d3dx12.h"
|
||||
#include <d3dx12.h>
|
||||
#include <dxgi1_6.h>
|
||||
#define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
|
||||
#include "D3D12MemAlloc.h"
|
||||
#include <D3D12MemAlloc.h>
|
||||
|
||||
#include <wrl/client.h>
|
||||
|
||||
|
|
@ -69,12 +52,6 @@
|
|||
#undef MemoryBarrier
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
using Microsoft::WRL::ComPtr;
|
||||
|
||||
#define D3D12_BITCODE_OFFSETS_NUM_STAGES 3
|
||||
|
|
@ -116,16 +93,6 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
|
|||
uint32_t supported_operations_flags_rd() const;
|
||||
};
|
||||
|
||||
struct VRSCapabilities {
|
||||
bool draw_call_supported = false; // We can specify our fragment rate on a draw call level.
|
||||
bool primitive_supported = false; // We can specify our fragment rate on each drawcall.
|
||||
bool primitive_in_multiviewport = false;
|
||||
bool ss_image_supported = false; // We can provide a density map attachment on our framebuffer.
|
||||
uint32_t ss_image_tile_size = 0;
|
||||
uint32_t ss_max_fragment_size = 0;
|
||||
bool additional_rates_supported = false;
|
||||
};
|
||||
|
||||
struct ShaderCapabilities {
|
||||
D3D_SHADER_MODEL shader_model = (D3D_SHADER_MODEL)0;
|
||||
bool native_16bit_ops = false;
|
||||
|
|
@ -157,7 +124,8 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
|
|||
uint32_t feature_level = 0; // Major * 10 + minor.
|
||||
SubgroupCapabilities subgroup_capabilities;
|
||||
RDD::MultiviewCapabilities multiview_capabilities;
|
||||
VRSCapabilities vrs_capabilities;
|
||||
FragmentShadingRateCapabilities fsr_capabilities;
|
||||
FragmentDensityMapCapabilities fdm_capabilities;
|
||||
ShaderCapabilities shader_capabilities;
|
||||
StorageBufferCapabilities storage_buffer_capabilities;
|
||||
FormatCapabilities format_capabilities;
|
||||
|
|
@ -834,7 +802,7 @@ private:
|
|||
};
|
||||
|
||||
public:
|
||||
virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) override final;
|
||||
virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) override final;
|
||||
virtual void render_pass_free(RenderPassID p_render_pass) override final;
|
||||
|
||||
// ----- COMMANDS -----
|
||||
|
|
@ -1002,6 +970,8 @@ public:
|
|||
virtual uint64_t api_trait_get(ApiTrait p_trait) override final;
|
||||
virtual bool has_feature(Features p_feature) override final;
|
||||
virtual const MultiviewCapabilities &get_multiview_capabilities() override final;
|
||||
virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() override final;
|
||||
virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() override final;
|
||||
virtual String get_api_name() const override final;
|
||||
virtual String get_api_version() const override final;
|
||||
virtual String get_pipeline_cache_uuid() const override final;
|
||||
|
|
@ -1036,5 +1006,3 @@ public:
|
|||
RenderingDeviceDriverD3D12(RenderingContextDriverD3D12 *p_context_driver);
|
||||
virtual ~RenderingDeviceDriverD3D12();
|
||||
};
|
||||
|
||||
#endif // RENDERING_DEVICE_DRIVER_D3D12_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue