godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92444 from clayjohn/RD-srgb-uniform-buffer 

Separate linear and sRGB uniform buffers in RD rendering backends
This commit is contained in:
Rémi Verschelde 2024-05-31 14:16:43 +02:00
parent d30456fea8 c6b08d462a
commit 138f334316
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
servers/rendering/renderer_rd/storage_rd/material_storage.cpp
View File

@ -746,8 +746,10 @@ MaterialStorage::MaterialData::~MaterialData() {
material_storage->global_shader_uniforms.materials_using_texture.erase(global_texture_E); material_storage->global_shader_uniforms.materials_using_texture.erase(global_texture_E);
} }
if (uniform_buffer.is_valid()) { for (int i = 0; i < 2; i++) {
RD::get_singleton()->free(uniform_buffer); if (uniform_buffer[i].is_valid()) {
RD::get_singleton()->free(uniform_buffer[i]);
}
} }
} }
@ -987,17 +989,17 @@ void MaterialStorage::MaterialData::free_parameters_uniform_set(RID p_uniform_se
} }
bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty, const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, const HashMap<StringName, HashMap<int, RID>> &p_default_texture_params, uint32_t p_ubo_size, RID &uniform_set, RID p_shader, uint32_t p_shader_uniform_set, bool p_use_linear_color, bool p_3d_material) { bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty, const HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> &p_uniforms, const uint32_t *p_uniform_offsets, const Vector<ShaderCompiler::GeneratedCode::Texture> &p_texture_uniforms, const HashMap<StringName, HashMap<int, RID>> &p_default_texture_params, uint32_t p_ubo_size, RID &uniform_set, RID p_shader, uint32_t p_shader_uniform_set, bool p_use_linear_color, bool p_3d_material) {
if ((uint32_t)ubo_data.size() != p_ubo_size) { if ((uint32_t)ubo_data[p_use_linear_color].size() != p_ubo_size) {
p_uniform_dirty = true; p_uniform_dirty = true;
if (uniform_buffer.is_valid()) { if (uniform_buffer[p_use_linear_color].is_valid()) {
RD::get_singleton()->free(uniform_buffer); RD::get_singleton()->free(uniform_buffer[p_use_linear_color]);
uniform_buffer = RID(); uniform_buffer[p_use_linear_color] = RID();
} }
ubo_data.resize(p_ubo_size); ubo_data[p_use_linear_color].resize(p_ubo_size);
if (ubo_data.size()) { if (ubo_data[p_use_linear_color].size()) {
uniform_buffer = RD::get_singleton()->uniform_buffer_create(ubo_data.size()); uniform_buffer[p_use_linear_color] = RD::get_singleton()->uniform_buffer_create(ubo_data[p_use_linear_color].size());
memset(ubo_data.ptrw(), 0, ubo_data.size()); //clear memset(ubo_data[p_use_linear_color].ptrw(), 0, ubo_data[p_use_linear_color].size()); //clear
} }
//clear previous uniform set //clear previous uniform set
@ -1009,9 +1011,9 @@ bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap<
} }
//check whether buffer changed //check whether buffer changed
if (p_uniform_dirty && ubo_data.size()) { if (p_uniform_dirty && ubo_data[p_use_linear_color].size()) {
update_uniform_buffer(p_uniforms, p_uniform_offsets, p_parameters, ubo_data.ptrw(), ubo_data.size(), p_use_linear_color); update_uniform_buffer(p_uniforms, p_uniform_offsets, p_parameters, ubo_data[p_use_linear_color].ptrw(), ubo_data[p_use_linear_color].size(), p_use_linear_color);
RD::get_singleton()->buffer_update(uniform_buffer, 0, ubo_data.size(), ubo_data.ptrw()); RD::get_singleton()->buffer_update(uniform_buffer[p_use_linear_color], 0, ubo_data[p_use_linear_color].size(), ubo_data[p_use_linear_color].ptrw());
} }
uint32_t tex_uniform_count = 0U; uint32_t tex_uniform_count = 0U;
@ -1053,7 +1055,7 @@ bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap<
RD::Uniform u; RD::Uniform u;
u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER; u.uniform_type = RD::UNIFORM_TYPE_UNIFORM_BUFFER;
u.binding = 0; u.binding = 0;
u.append_id(uniform_buffer); u.append_id(uniform_buffer[p_use_linear_color]);
uniforms.push_back(u); uniforms.push_back(u);
} }

4
servers/rendering/renderer_rd/storage_rd/material_storage.h
View File

@ -100,8 +100,8 @@ public:
HashMap<StringName, uint64_t> used_global_textures; HashMap<StringName, uint64_t> used_global_textures;
//internally by update_parameters_uniform_set //internally by update_parameters_uniform_set
Vector<uint8_t> ubo_data; Vector<uint8_t> ubo_data[2]; // 0: linear buffer; 1: sRGB buffer.
RID uniform_buffer; RID uniform_buffer[2]; // 0: linear buffer; 1: sRGB buffer.
Vector<RID> texture_cache; Vector<RID> texture_cache;
}; };