asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #93530 from BastiaanOlij/fix_opengl_post

Browse source 
Fix incorrect enabling of post process in OpenGL
This commit is contained in:
Rémi Verschelde 2024-06-25 09:19:57 +02:00
commit fb8a1f143a
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gles3/rasterizer_scene_gles3.cpp
View file

@ -2247,7 +2247,6 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
bool glow_enabled = false; bool glow_enabled = false;
if (p_environment.is_valid()) { if (p_environment.is_valid()) {
glow_enabled = environment_get_glow_enabled(p_environment); glow_enabled = environment_get_glow_enabled(p_environment);
rb->ensure_internal_buffers(); // Ensure our intermediate buffer is available if glow is enabled
if (glow_enabled) { if (glow_enabled) {
// If glow is enabled, we apply tonemapping etc. in post, so disable it during rendering // If glow is enabled, we apply tonemapping etc. in post, so disable it during rendering
apply_color_adjustments_in_post = true; apply_color_adjustments_in_post = true;
@ -2339,7 +2338,6 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
if (render_data.environment.is_valid()) { if (render_data.environment.is_valid()) {
bool use_bcs = environment_get_adjustments_enabled(render_data.environment); bool use_bcs = environment_get_adjustments_enabled(render_data.environment);
if (use_bcs) { if (use_bcs) {
rb->ensure_internal_buffers();
apply_color_adjustments_in_post = true; apply_color_adjustments_in_post = true;
} }
@ -2473,6 +2471,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
if (is_reflection_probe) { if (is_reflection_probe) {
fbo = GLES3::LightStorage::get_singleton()->reflection_probe_instance_get_framebuffer(render_data.reflection_probe, render_data.reflection_probe_pass); fbo = GLES3::LightStorage::get_singleton()->reflection_probe_instance_get_framebuffer(render_data.reflection_probe, render_data.reflection_probe_pass);
} else { } else {
rb->set_apply_color_adjustments_in_post(apply_color_adjustments_in_post);
fbo = rb->get_render_fbo(); fbo = rb->get_render_fbo();
} }

6
drivers/gles3/storage/render_scene_buffers_gles3.cpp
View file

@ -194,7 +194,7 @@ void RenderSceneBuffersGLES3::_check_render_buffers() {
ERR_FAIL_COND(view_count == 0); ERR_FAIL_COND(view_count == 0);
bool use_internal_buffer = scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF || needs_internal_buffers; bool use_internal_buffer = scaling_3d_mode != RS::VIEWPORT_SCALING_3D_MODE_OFF || apply_color_adjustments_in_post;
uint32_t depth_format_size = 3; uint32_t depth_format_size = 3;
bool use_multiview = view_count > 1; bool use_multiview = view_count > 1;
@ -558,8 +558,8 @@ void RenderSceneBuffersGLES3::_clear_back_buffers() {
} }
} }
void RenderSceneBuffersGLES3::ensure_internal_buffers() { void RenderSceneBuffersGLES3::set_apply_color_adjustments_in_post(bool p_apply_in_post) {
needs_internal_buffers = true; apply_color_adjustments_in_post = p_apply_in_post;
} }
void RenderSceneBuffersGLES3::check_glow_buffers() { void RenderSceneBuffersGLES3::check_glow_buffers() {

4
drivers/gles3/storage/render_scene_buffers_gles3.h
View file

@ -50,7 +50,7 @@ public:
//bool use_taa = false; //bool use_taa = false;
//bool use_debanding = false; //bool use_debanding = false;
uint32_t view_count = 1; uint32_t view_count = 1;
bool needs_internal_buffers = false; bool apply_color_adjustments_in_post = false;
RID render_target; RID render_target;
@ -106,12 +106,12 @@ public:
virtual void set_fsr_sharpness(float p_fsr_sharpness) override{}; virtual void set_fsr_sharpness(float p_fsr_sharpness) override{};
virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override{}; virtual void set_texture_mipmap_bias(float p_texture_mipmap_bias) override{};
virtual void set_use_debanding(bool p_use_debanding) override{}; virtual void set_use_debanding(bool p_use_debanding) override{};
void set_apply_color_adjustments_in_post(bool p_apply_in_post);
void free_render_buffer_data(); void free_render_buffer_data();
void check_backbuffer(bool p_need_color, bool p_need_depth); // Check if we need to initialize our backbuffer. void check_backbuffer(bool p_need_color, bool p_need_depth); // Check if we need to initialize our backbuffer.
void check_glow_buffers(); // Check if we need to initialize our glow buffers. void check_glow_buffers(); // Check if we need to initialize our glow buffers.
void ensure_internal_buffers();
GLuint get_render_fbo(); GLuint get_render_fbo();
GLuint get_msaa3d_fbo() { GLuint get_msaa3d_fbo() {