From 0586e184490fd132f99acb1a67c788959cfdbade Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 27 Jul 2019 10:23:24 -0300 Subject: Custom material support seems complete. --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 140 +++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 servers/visual/rasterizer_rd/rasterizer_rd.cpp (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp new file mode 100644 index 0000000000..d1c7549409 --- /dev/null +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -0,0 +1,140 @@ +#include "rasterizer_rd.h" + +void RasterizerRD::prepare_for_blitting_render_targets() { + RD::get_singleton()->prepare_screen_for_drawing(); +} + +void RasterizerRD::blit_render_targets_to_screen(int p_screen, const BlitToScreen *p_render_targets, int p_amount) { + + RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin_for_screen(p_screen); + + for (int i = 0; i < p_amount; i++) { + RID texture = storage->render_target_get_texture(p_render_targets[i].render_target); + ERR_CONTINUE(texture.is_null()); + RID rd_texture = storage->texture_get_rd_texture(texture); + ERR_CONTINUE(rd_texture.is_null()); + if (!render_target_descriptors.has(rd_texture) || !RD::get_singleton()->uniform_set_is_valid(render_target_descriptors[rd_texture])) { + Vector uniforms; + RD::Uniform u; + u.type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE; + u.binding = 0; + u.ids.push_back(copy_viewports_sampler); + u.ids.push_back(rd_texture); + uniforms.push_back(u); + RID uniform_set = RD::get_singleton()->uniform_set_create(uniforms, copy_viewports_rd_shader, 0); + + render_target_descriptors[rd_texture] = uniform_set; + } + + Size2 screen_size(RD::get_singleton()->screen_get_width(p_screen), RD::get_singleton()->screen_get_height(p_screen)); + + RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, copy_viewports_rd_pipeline); + RD::get_singleton()->draw_list_bind_index_array(draw_list, copy_viewports_rd_array); + RD::get_singleton()->draw_list_bind_uniform_set(draw_list, render_target_descriptors[rd_texture], 0); + + float push_constant[4] = { + p_render_targets[i].rect.position.x / screen_size.width, + p_render_targets[i].rect.position.y / screen_size.height, + p_render_targets[i].rect.size.width / screen_size.width, + p_render_targets[i].rect.size.height / screen_size.height, + }; + RD::get_singleton()->draw_list_set_push_constant(draw_list, push_constant, 4 * sizeof(float)); + RD::get_singleton()->draw_list_draw(draw_list, true); + } + + RD::get_singleton()->draw_list_end(); +} + +void RasterizerRD::begin_frame(double frame_step) { + time += frame_step; + canvas->set_time(time); +} + +void RasterizerRD::end_frame(bool p_swap_buffers) { + + RD::get_singleton()->finalize_frame(); +#warning not swapping buffers likely not an option for now, find another way + OS::get_singleton()->swap_buffers(); //probably should pass some bool to avoid display? + RD::get_singleton()->advance_frame(); //advance frame here, so any new call happens on new frame +} + +void RasterizerRD::initialize() { + + { //create framebuffer copy shader + RenderingDevice::ShaderStageSource vert; + vert.shader_stage = RenderingDevice::SHADER_STAGE_VERTEX; + vert.shader_source = + "#version 450\n" + "layout(push_constant, binding = 0, std140) uniform Pos { vec4 dst_rect; } pos;\n" + "layout(location =0) out vec2 uv;\n" + "void main() { \n" + " vec2 base_arr[4] = vec2[](vec2(0.0,0.0),vec2(0.0,1.0),vec2(1.0,1.0),vec2(1.0,0.0));\n" + " uv = base_arr[gl_VertexIndex];\n" + " vec2 vtx = pos.dst_rect.xy+uv*pos.dst_rect.zw;\n" + " gl_Position = vec4(vtx * 2.0 - 1.0,0.0,1.0);\n" + "}\n"; + + RenderingDevice::ShaderStageSource frag; + frag.shader_stage = RenderingDevice::SHADER_STAGE_FRAGMENT; + frag.shader_source = + "#version 450\n" + "layout (location = 0) in vec2 uv;\n" + "layout (location = 0) out vec4 color;\n" + "layout (binding = 0) uniform sampler2D src_rt;\n" + "void main() { color=texture(src_rt,uv); }\n"; + + Vector source; + source.push_back(vert); + source.push_back(frag); + String error; + copy_viewports_rd_shader = RD::get_singleton()->shader_create_from_source(source, &error); + if (!copy_viewports_rd_shader.is_valid()) { + print_line("failed compilation: " + error); + } else { + print_line("compilation success"); + } + } + + { //create index array for copy shader + PoolVector pv; + pv.resize(6 * 4); + { + PoolVector::Write w = pv.write(); + int *p32 = (int *)w.ptr(); + p32[0] = 0; + p32[1] = 1; + p32[2] = 2; + p32[3] = 0; + p32[4] = 2; + p32[5] = 3; + } + copy_viewports_rd_index_buffer = RD::get_singleton()->index_buffer_create(6, RenderingDevice::INDEX_BUFFER_FORMAT_UINT32, pv); + copy_viewports_rd_array = RD::get_singleton()->index_array_create(copy_viewports_rd_index_buffer, 0, 6); + } + + { //pipeline + copy_viewports_rd_pipeline = RD::get_singleton()->render_pipeline_create(copy_viewports_rd_shader, RD::get_singleton()->screen_get_framebuffer_format(), RD::INVALID_ID, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), RD::PipelineDepthStencilState(), RenderingDevice::PipelineColorBlendState::create_disabled(), 0); + } + { // sampler + copy_viewports_sampler = RD::get_singleton()->sampler_create(RD::SamplerState()); + } +} + +void RasterizerRD::finalize() { + + memdelete(scene); + memdelete(canvas); + memdelete(storage); + + //only need to erase these, the rest are erased by cascade + RD::get_singleton()->free(copy_viewports_rd_index_buffer); + RD::get_singleton()->free(copy_viewports_rd_shader); + RD::get_singleton()->free(copy_viewports_sampler); +} + +RasterizerRD::RasterizerRD() { + time = 0; + storage = memnew(RasterizerStorageRD); + canvas = memnew(RasterizerCanvasRD(storage)); + scene = memnew(RasterizerSceneForwardRD); +} -- cgit v1.2.3 From c613ead5fa2361296cf8d9a80d4648492ff4e16f Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 29 Jul 2019 12:59:18 -0300 Subject: Added a spinlock template as well as a thread work pool class. Also, optimized shader compilation to happen on threads. --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 9be7a6e3f7..8a77d9a71e 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -76,7 +76,7 @@ void RasterizerRD::initialize() { RenderingDevice::ShaderStageData frag; frag.shader_stage = RenderingDevice::SHADER_STAGE_FRAGMENT; - frag.spir_v =RenderingDevice::get_singleton()->shader_compile_from_source(RenderingDevice::SHADER_STAGE_FRAGMENT, + frag.spir_v = RenderingDevice::get_singleton()->shader_compile_from_source(RenderingDevice::SHADER_STAGE_FRAGMENT, "#version 450\n" "layout (location = 0) in vec2 uv;\n" "layout (location = 0) out vec4 color;\n" @@ -120,8 +120,12 @@ void RasterizerRD::initialize() { } } +ThreadWorkPool RasterizerRD::thread_work_pool; + void RasterizerRD::finalize() { + thread_work_pool.finish(); + memdelete(scene); memdelete(canvas); memdelete(storage); @@ -133,6 +137,7 @@ void RasterizerRD::finalize() { } RasterizerRD::RasterizerRD() { + thread_work_pool.init(); time = 0; storage = memnew(RasterizerStorageRD); canvas = memnew(RasterizerCanvasRD(storage)); -- cgit v1.2.3 From 4fe3ee1730167b90ec8ae70c871c1dad032981d5 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 28 Jul 2019 19:58:32 -0300 Subject: Moved the shader source compilation code outside RenderingDevice and Vulkan --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index d1c7549409..9be7a6e3f7 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -61,9 +61,9 @@ void RasterizerRD::end_frame(bool p_swap_buffers) { void RasterizerRD::initialize() { { //create framebuffer copy shader - RenderingDevice::ShaderStageSource vert; + RenderingDevice::ShaderStageData vert; vert.shader_stage = RenderingDevice::SHADER_STAGE_VERTEX; - vert.shader_source = + vert.spir_v = RenderingDevice::get_singleton()->shader_compile_from_source(RenderingDevice::SHADER_STAGE_VERTEX, "#version 450\n" "layout(push_constant, binding = 0, std140) uniform Pos { vec4 dst_rect; } pos;\n" "layout(location =0) out vec2 uv;\n" @@ -72,22 +72,22 @@ void RasterizerRD::initialize() { " uv = base_arr[gl_VertexIndex];\n" " vec2 vtx = pos.dst_rect.xy+uv*pos.dst_rect.zw;\n" " gl_Position = vec4(vtx * 2.0 - 1.0,0.0,1.0);\n" - "}\n"; + "}\n"); - RenderingDevice::ShaderStageSource frag; + RenderingDevice::ShaderStageData frag; frag.shader_stage = RenderingDevice::SHADER_STAGE_FRAGMENT; - frag.shader_source = + frag.spir_v =RenderingDevice::get_singleton()->shader_compile_from_source(RenderingDevice::SHADER_STAGE_FRAGMENT, "#version 450\n" "layout (location = 0) in vec2 uv;\n" "layout (location = 0) out vec4 color;\n" "layout (binding = 0) uniform sampler2D src_rt;\n" - "void main() { color=texture(src_rt,uv); }\n"; + "void main() { color=texture(src_rt,uv); }\n"); - Vector source; + Vector source; source.push_back(vert); source.push_back(frag); String error; - copy_viewports_rd_shader = RD::get_singleton()->shader_create_from_source(source, &error); + copy_viewports_rd_shader = RD::get_singleton()->shader_create(source); if (!copy_viewports_rd_shader.is_valid()) { print_line("failed compilation: " + error); } else { -- cgit v1.2.3 From 6ecedd1e6ca7d8b10b13a3dab19074fd51b17bcf Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 29 Jul 2019 15:29:43 -0300 Subject: Add a system to properly update materials if the uniform set is gone (likely deleted texture) --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 8a77d9a71e..682f87e519 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -46,6 +46,7 @@ void RasterizerRD::blit_render_targets_to_screen(int p_screen, const BlitToScree } void RasterizerRD::begin_frame(double frame_step) { + frame++; time += frame_step; canvas->set_time(time); } @@ -121,6 +122,7 @@ void RasterizerRD::initialize() { } ThreadWorkPool RasterizerRD::thread_work_pool; +uint32_t RasterizerRD::frame = 1; void RasterizerRD::finalize() { @@ -139,6 +141,7 @@ void RasterizerRD::finalize() { RasterizerRD::RasterizerRD() { thread_work_pool.init(); time = 0; + storage = memnew(RasterizerStorageRD); canvas = memnew(RasterizerCanvasRD(storage)); scene = memnew(RasterizerSceneForwardRD); -- cgit v1.2.3 From eb48be51dbe97aa4fbbbe0d0ebd8a98bee6b263e Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Sat, 22 Jun 2019 19:34:26 +0300 Subject: Add static Vulkan loader. Initial Vulkan support for Windows. Initial Vulkan support for macOS. --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 9be7a6e3f7..9f54ba874f 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* rasterizer_rd.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + #include "rasterizer_rd.h" void RasterizerRD::prepare_for_blitting_render_targets() { @@ -53,7 +83,9 @@ void RasterizerRD::begin_frame(double frame_step) { void RasterizerRD::end_frame(bool p_swap_buffers) { RD::get_singleton()->finalize_frame(); +#ifndef _MSC_VER #warning not swapping buffers likely not an option for now, find another way +#endif OS::get_singleton()->swap_buffers(); //probably should pass some bool to avoid display? RD::get_singleton()->advance_frame(); //advance frame here, so any new call happens on new frame } -- cgit v1.2.3 From 449df8f688080c02bfbbfafc45421875b77deb1b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 18 Aug 2019 19:40:52 -0300 Subject: Base 3D engine done, still untested, though. --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 8cc090832b..fc38b90b88 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -79,6 +79,7 @@ void RasterizerRD::begin_frame(double frame_step) { frame++; time += frame_step; canvas->set_time(time); + scene->set_time(time); } void RasterizerRD::end_frame(bool p_swap_buffers) { @@ -176,5 +177,5 @@ RasterizerRD::RasterizerRD() { storage = memnew(RasterizerStorageRD); canvas = memnew(RasterizerCanvasRD(storage)); - scene = memnew(RasterizerSceneForwardRD); + scene = memnew(RasterizerSceneForwardRD(storage)); } -- cgit v1.2.3 From 6ee2f5e6b6663f5a4987954d43bb6df6d1f62d2a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 5 Oct 2019 10:27:43 -0300 Subject: More GIProbe work and fixes --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index fc38b90b88..89465b580c 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -84,12 +84,10 @@ void RasterizerRD::begin_frame(double frame_step) { void RasterizerRD::end_frame(bool p_swap_buffers) { - RD::get_singleton()->finalize_frame(); #ifndef _MSC_VER -#warning not swapping buffers likely not an option for now, find another way +#warning TODO: likely passa bool to swap buffers to avoid display? #endif - OS::get_singleton()->swap_buffers(); //probably should pass some bool to avoid display? - RD::get_singleton()->advance_frame(); //advance frame here, so any new call happens on new frame + RD::get_singleton()->swap_buffers(); //probably should pass some bool to avoid display? } void RasterizerRD::initialize() { -- cgit v1.2.3 From bd364d1447ea3b745299c6460d6d90acd8637ab5 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 11 Jan 2020 22:26:52 -0300 Subject: Auto exposure re-implemented in Vulkan --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 89465b580c..b9fe0caf9d 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -79,7 +79,7 @@ void RasterizerRD::begin_frame(double frame_step) { frame++; time += frame_step; canvas->set_time(time); - scene->set_time(time); + scene->set_time(time, frame_step); } void RasterizerRD::end_frame(bool p_swap_buffers) { -- cgit v1.2.3 From ee1e89f8c0dc4659a2ed4b5afd5e7c1c596f7af1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 21 Jan 2020 14:24:22 -0300 Subject: Modified rendering to use cluster instead of foward --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index b9fe0caf9d..9a55235fa1 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -175,5 +175,5 @@ RasterizerRD::RasterizerRD() { storage = memnew(RasterizerStorageRD); canvas = memnew(RasterizerCanvasRD(storage)); - scene = memnew(RasterizerSceneForwardRD(storage)); + scene = memnew(RasterizerSceneHighEndRD(storage)); } -- cgit v1.2.3 From db81928e08cb58d5f67908c6dfcf9433e572ffe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 11 Feb 2020 14:01:43 +0100 Subject: Vulkan: Move thirdparty code out of drivers, style fixes - `vk_enum_string_helper.h` is a generated file taken from the SDK (Vulkan-ValidationLayers). - `vk_mem_alloc.h` is a library from GPUOpen: https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator --- servers/visual/rasterizer_rd/rasterizer_rd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'servers/visual/rasterizer_rd/rasterizer_rd.cpp') diff --git a/servers/visual/rasterizer_rd/rasterizer_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_rd.cpp index 9a55235fa1..34be4817f6 100644 --- a/servers/visual/rasterizer_rd/rasterizer_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_rd.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ -- cgit v1.2.3