Skip to content

Commit 9ecdeb3

Browse files
committed
Merge pull request #98747 from tetrapod00/standardize-renderer-strings
Standardize terms for renderers in error strings
2 parents b68675e + 899f515 commit 9ecdeb3

18 files changed

+39
-39
lines changed

drivers/gles3/rasterizer_canvas_gles3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ class RasterizerCanvasGLES3 : public RendererCanvasRender {
373373

374374
virtual void set_debug_redraw(bool p_enabled, double p_time, const Color &p_color) override {
375375
if (p_enabled) {
376-
WARN_PRINT_ONCE("Debug CanvasItem Redraw is not available yet when using the GL Compatibility backend.");
376+
WARN_PRINT_ONCE("Debug CanvasItem Redraw is not available yet when using the Compatibility renderer.");
377377
}
378378
}
379379

drivers/gles3/rasterizer_scene_gles3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,7 @@ void RasterizerSceneGLES3::_render_shadow_pass(RID p_light, RID p_shadow_atlas,
21292129
light_transform = light_storage->light_instance_get_shadow_transform(p_light, p_pass);
21302130
shadow_size = shadow_size / 2;
21312131
} else {
2132-
ERR_FAIL_MSG("Dual paraboloid shadow mode not supported in GL Compatibility renderer. Please use Cubemap shadow mode instead.");
2132+
ERR_FAIL_MSG("Dual paraboloid shadow mode not supported in the Compatibility renderer. Please use CubeMap shadow mode instead.");
21332133
}
21342134

21352135
shadow_bias = light_storage->light_get_param(base, RS::LIGHT_PARAM_SHADOW_BIAS);

drivers/gles3/storage/material_storage.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
945945
}
946946
} break;
947947
case ShaderLanguage::TYPE_SAMPLERCUBEARRAY: {
948-
ERR_PRINT_ONCE("Type: SamplerCubeArray not supported in GL Compatibility rendering backend, please use another type.");
948+
ERR_PRINT_ONCE("Type: SamplerCubeArray is not supported in the Compatibility renderer, please use another type.");
949949
} break;
950950
case ShaderLanguage::TYPE_SAMPLEREXT: {
951951
gl_texture = texture_storage->texture_gl_get_default(DEFAULT_GL_TEXTURE_EXT);
@@ -3013,19 +3013,19 @@ void SceneShaderData::set_code(const String &p_code) {
30133013

30143014
#ifdef DEBUG_ENABLED
30153015
if (uses_particle_trails) {
3016-
WARN_PRINT_ONCE_ED("Particle trails are only available when using the Forward+ or Mobile rendering backends.");
3016+
WARN_PRINT_ONCE_ED("Particle trails are only available when using the Forward+ or Mobile renderers.");
30173017
}
30183018

30193019
if (uses_sss) {
3020-
WARN_PRINT_ONCE_ED("Sub-surface scattering is only available when using the Forward+ rendering backend.");
3020+
WARN_PRINT_ONCE_ED("Subsurface scattering is only available when using the Forward+ renderer.");
30213021
}
30223022

30233023
if (uses_transmittance) {
3024-
WARN_PRINT_ONCE_ED("Transmittance is only available when using the Forward+ rendering backend.");
3024+
WARN_PRINT_ONCE_ED("Transmittance is only available when using the Forward+ renderer.");
30253025
}
30263026

30273027
if (uses_normal_texture) {
3028-
WARN_PRINT_ONCE_ED("Reading from the normal-roughness texture is only available when using the Forward+ or Mobile rendering backends.");
3028+
WARN_PRINT_ONCE_ED("Reading from the normal-roughness texture is only available when using the Forward+ or Mobile renderers.");
30293029
}
30303030
#endif
30313031

drivers/gles3/storage/particles_storage.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,13 @@ void ParticlesStorage::particles_set_fractional_delta(RID p_particles, bool p_en
287287

288288
void ParticlesStorage::particles_set_trails(RID p_particles, bool p_enable, double p_length) {
289289
if (p_enable) {
290-
WARN_PRINT_ONCE_ED("The GL Compatibility rendering backend does not support particle trails.");
290+
WARN_PRINT_ONCE_ED("The Compatibility renderer does not support particle trails.");
291291
}
292292
}
293293

294294
void ParticlesStorage::particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) {
295295
if (p_bind_poses.size() != 0) {
296-
WARN_PRINT_ONCE_ED("The GL Compatibility rendering backend does not support particle trails.");
296+
WARN_PRINT_ONCE_ED("The Compatibility renderer does not support particle trails.");
297297
}
298298
}
299299

@@ -357,12 +357,12 @@ void ParticlesStorage::particles_restart(RID p_particles) {
357357

358358
void ParticlesStorage::particles_set_subemitter(RID p_particles, RID p_subemitter_particles) {
359359
if (p_subemitter_particles.is_valid()) {
360-
WARN_PRINT_ONCE_ED("The GL Compatibility rendering backend does not support particle sub-emitters.");
360+
WARN_PRINT_ONCE_ED("The Compatibility renderer does not support particle sub-emitters.");
361361
}
362362
}
363363

364364
void ParticlesStorage::particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) {
365-
WARN_PRINT_ONCE_ED("The GL Compatibility rendering backend does not support manually emitting particles.");
365+
WARN_PRINT_ONCE_ED("The Compatibility renderer does not support manually emitting particles.");
366366
}
367367

368368
void ParticlesStorage::particles_request_process(RID p_particles) {
@@ -645,7 +645,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
645645
attr.extents[2] = extents.z;
646646
} break;
647647
case RS::PARTICLES_COLLISION_TYPE_VECTOR_FIELD_ATTRACT: {
648-
WARN_PRINT_ONCE_ED("Vector field particle attractors are not available in the GL Compatibility rendering backend.");
648+
WARN_PRINT_ONCE_ED("Vector field particle attractors are not available in the Compatibility renderer.");
649649
} break;
650650
default: {
651651
}
@@ -678,7 +678,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
678678
col.extents[2] = extents.z;
679679
} break;
680680
case RS::PARTICLES_COLLISION_TYPE_SDF_COLLIDE: {
681-
WARN_PRINT_ONCE_ED("SDF Particle Colliders are not available in the GL Compatibility rendering backend.");
681+
WARN_PRINT_ONCE_ED("SDF Particle Colliders are not available in the Compatibility renderer.");
682682
} break;
683683
case RS::PARTICLES_COLLISION_TYPE_HEIGHTFIELD_COLLIDE: {
684684
if (collision_heightmap_texture != 0) { //already taken
@@ -1341,7 +1341,7 @@ void ParticlesStorage::particles_collision_set_attractor_attenuation(RID p_parti
13411341
}
13421342

13431343
void ParticlesStorage::particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) {
1344-
WARN_PRINT_ONCE_ED("The GL Compatibility rendering backend does not support SDF collisions in 3D particle shaders");
1344+
WARN_PRINT_ONCE_ED("The Compatibility renderer does not support SDF collisions in 3D particle shaders");
13451345
}
13461346

13471347
void ParticlesStorage::particles_collision_height_field_update(RID p_particles_collision) {

drivers/gles3/storage/texture_storage.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ Ref<Image> TextureStorage::_get_gl_image_and_format(const Ref<Image> &p_image, I
681681
}
682682
} break;
683683
default: {
684-
ERR_FAIL_V_MSG(Ref<Image>(), "The image format " + itos(p_format) + " is not supported by the GL Compatibility rendering backend.");
684+
ERR_FAIL_V_MSG(Ref<Image>(), vformat("The image format %d is not supported by the Compatibility renderer.", p_format));
685685
}
686686
}
687687

@@ -841,7 +841,7 @@ void TextureStorage::texture_2d_layered_initialize(RID p_texture, const Vector<R
841841
ERR_FAIL_COND(p_layers.is_empty());
842842

843843
ERR_FAIL_COND(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP && p_layers.size() != 6);
844-
ERR_FAIL_COND_MSG(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP_ARRAY, "Cubemap Arrays are not supported in the GL Compatibility backend.");
844+
ERR_FAIL_COND_MSG(p_layered_type == RS::TEXTURE_LAYERED_CUBEMAP_ARRAY, "Cubemap Arrays are not supported in the Compatibility renderer.");
845845

846846
const Ref<Image> &image = p_layers[0];
847847
{
@@ -1633,7 +1633,7 @@ void TextureStorage::_texture_set_3d_data(RID p_texture, const Vector<Ref<Image>
16331633
Ref<Image> img = _get_gl_image_and_format(p_data[0], p_data[0]->get_format(), real_format, format, internal_format, type, compressed, texture->resize_to_po2);
16341634
ERR_FAIL_COND(img.is_null());
16351635

1636-
ERR_FAIL_COND_MSG(compressed, "Compressed 3D textures are not supported in the GL Compatibility backend.");
1636+
ERR_FAIL_COND_MSG(compressed, "Compressed 3D textures are not supported in the Compatibility renderer.");
16371637

16381638
glActiveTexture(GL_TEXTURE0);
16391639
glBindTexture(texture->target, texture->tex_id);

editor/import/resource_importer_shader_file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static String _include_function(const String &p_path, void *userpointer) {
9191

9292
Error ResourceImporterShaderFile::import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
9393
/* STEP 1, Read shader code */
94-
ERR_FAIL_COND_V_EDMSG((OS::get_singleton()->get_current_rendering_method() == "gl_compatibility"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when using the gl_compatibility rendering_method. Please switch to the forward_plus or mobile rendering methods to use custom shaders.");
94+
ERR_FAIL_COND_V_EDMSG((OS::get_singleton()->get_current_rendering_method() == "gl_compatibility"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when using the Compatibility renderer. Please switch to the Forward+ or Mobile renderer to use custom shaders.");
9595
ERR_FAIL_COND_V_EDMSG((DisplayServer::get_singleton()->get_name() == "headless"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when running in headless mode.");
9696

9797
Error err;

scene/2d/gpu_particles_2d.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,11 @@ PackedStringArray GPUParticles2D::get_configuration_warnings() const {
345345
}
346346

347347
if (trail_enabled && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
348-
warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile rendering backends."));
348+
warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile renderers."));
349349
}
350350

351351
if (sub_emitter != NodePath() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
352-
warnings.push_back(RTR("Particle sub-emitters are not available when using the GL Compatibility rendering backend."));
352+
warnings.push_back(RTR("Particle sub-emitters are not available when using the Compatibility renderer."));
353353
}
354354

355355
return warnings;

scene/3d/decal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ PackedStringArray Decal::get_configuration_warnings() const {
166166
PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();
167167

168168
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
169-
warnings.push_back(RTR("Decals are only available when using the Forward+ or Mobile rendering backends."));
169+
warnings.push_back(RTR("Decals are only available when using the Forward+ or Mobile renderers."));
170170
return warnings;
171171
}
172172

scene/3d/fog_volume.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ PackedStringArray FogVolume::get_configuration_warnings() const {
121121
Ref<Environment> environment = get_viewport()->find_world_3d()->get_environment();
122122

123123
if (OS::get_singleton()->get_current_rendering_method() != "forward_plus") {
124-
warnings.push_back(RTR("Fog Volumes are only visible when using the Forward+ backend."));
124+
warnings.push_back(RTR("Fog Volumes are only visible when using the Forward+ renderer."));
125125
return warnings;
126126
}
127127

scene/3d/gpu_particles_3d.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ PackedStringArray GPUParticles3D::get_configuration_warnings() const {
385385
warnings.push_back(RTR("Trails enabled, but one or more mesh materials are either missing or not set for trails rendering."));
386386
}
387387
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
388-
warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile rendering backends."));
388+
warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile renderers."));
389389
}
390390
}
391391

392392
if (sub_emitter != NodePath() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
393-
warnings.push_back(RTR("Particle sub-emitters are only available when using the Forward+ or Mobile rendering backends."));
393+
warnings.push_back(RTR("Particle sub-emitters are only available when using the Forward+ or Mobile renderers."));
394394
}
395395

396396
return warnings;

0 commit comments

Comments
 (0)