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

Merge pull request #78584 from bgie/bgie

Browse source 
Moved variables closer to usage to fix unused variable warning
This commit is contained in:
Rémi Verschelde 2023-06-23 08:48:43 +02:00
commit 8d65fb9ec7
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/rasterizer_scene_gles3.cpp
View file

@ -2063,8 +2063,6 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
GLES3::MeshStorage *mesh_storage = GLES3::MeshStorage::get_singleton(); GLES3::MeshStorage *mesh_storage = GLES3::MeshStorage::get_singleton();
GLES3::ParticlesStorage *particles_storage = GLES3::ParticlesStorage::get_singleton(); GLES3::ParticlesStorage *particles_storage = GLES3::ParticlesStorage::get_singleton();
GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton(); GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
GLES3::Config *config = GLES3::Config::get_singleton();
GLuint prev_vertex_array_gl = 0; GLuint prev_vertex_array_gl = 0;
GLuint prev_index_array_gl = 0; GLuint prev_index_array_gl = 0;
@ -2097,6 +2095,8 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
} }
if constexpr (p_pass_mode == PASS_MODE_COLOR || p_pass_mode == PASS_MODE_COLOR_TRANSPARENT) { if constexpr (p_pass_mode == PASS_MODE_COLOR || p_pass_mode == PASS_MODE_COLOR_TRANSPARENT) {
GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
GLES3::Config *config = GLES3::Config::get_singleton();
glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 2); glActiveTexture(GL_TEXTURE0 + config->max_texture_image_units - 2);
GLuint texture_to_bind = texture_storage->get_texture(texture_storage->texture_gl_get_default(GLES3::DEFAULT_GL_TEXTURE_CUBEMAP_BLACK))->tex_id; GLuint texture_to_bind = texture_storage->get_texture(texture_storage->texture_gl_get_default(GLES3::DEFAULT_GL_TEXTURE_CUBEMAP_BLACK))->tex_id;
if (p_render_data->environment.is_valid()) { if (p_render_data->environment.is_valid()) {