Skip to content

Commit 7b3850b

Browse files
ProjectSettings: remove unused variables
these are unused since cf3f404
1 parent bfbe95e commit 7b3850b

File tree

7 files changed

+0
-60
lines changed

7 files changed

+0
-60
lines changed

doc/classes/ProjectSettings.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3400,17 +3400,9 @@
34003400
<member name="rendering/scaling_3d/scale" type="float" setter="" getter="" default="1.0">
34013401
Scales the 3D render buffer based on the viewport size uses an image filter specified in [member rendering/scaling_3d/mode] to scale the output image to the full viewport size. Values lower than [code]1.0[/code] can be used to speed up 3D rendering at the cost of quality (undersampling). Values greater than [code]1.0[/code] are only valid for bilinear mode and can be used to improve 3D rendering quality at a high performance cost (supersampling). See also [member rendering/anti_aliasing/quality/msaa_3d] for multi-sample antialiasing, which is significantly cheaper but only smooths the edges of polygons.
34023402
</member>
3403-
<member name="rendering/shader_compiler/shader_cache/compress" type="bool" setter="" getter="" default="true">
3404-
</member>
34053403
<member name="rendering/shader_compiler/shader_cache/enabled" type="bool" setter="" getter="" default="true">
34063404
Enable the shader cache, which stores compiled shaders to disk to prevent stuttering from shader compilation the next time the shader is needed.
34073405
</member>
3408-
<member name="rendering/shader_compiler/shader_cache/strip_debug" type="bool" setter="" getter="" default="false">
3409-
</member>
3410-
<member name="rendering/shader_compiler/shader_cache/strip_debug.release" type="bool" setter="" getter="" default="true">
3411-
</member>
3412-
<member name="rendering/shader_compiler/shader_cache/use_zstd_compression" type="bool" setter="" getter="" default="true">
3413-
</member>
34143406
<member name="rendering/shading/overrides/force_lambert_over_burley" type="bool" setter="" getter="" default="false">
34153407
If [code]true[/code], uses faster but lower-quality Lambert material lighting model instead of Burley.
34163408
</member>

drivers/gles3/shader_gles3.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -812,22 +812,7 @@ void ShaderGLES3::set_shader_cache_dir(const String &p_dir) {
812812
shader_cache_dir = p_dir;
813813
}
814814

815-
void ShaderGLES3::set_shader_cache_save_compressed(bool p_enable) {
816-
shader_cache_save_compressed = p_enable;
817-
}
818-
819-
void ShaderGLES3::set_shader_cache_save_compressed_zstd(bool p_enable) {
820-
shader_cache_save_compressed_zstd = p_enable;
821-
}
822-
823-
void ShaderGLES3::set_shader_cache_save_debug(bool p_enable) {
824-
shader_cache_save_debug = p_enable;
825-
}
826-
827815
String ShaderGLES3::shader_cache_dir;
828-
bool ShaderGLES3::shader_cache_save_compressed = true;
829-
bool ShaderGLES3::shader_cache_save_compressed_zstd = true;
830-
bool ShaderGLES3::shader_cache_save_debug = true;
831816

832817
ShaderGLES3::~ShaderGLES3() {
833818
LocalVector<RID> remaining = version_owner.get_owned_list();

drivers/gles3/shader_gles3.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ class ShaderGLES3 {
136136

137137
static String shader_cache_dir;
138138
static bool shader_cache_cleanup_on_start;
139-
static bool shader_cache_save_compressed;
140-
static bool shader_cache_save_compressed_zstd;
141-
static bool shader_cache_save_debug;
142139
bool shader_cache_dir_valid = false;
143140

144141
GLint max_image_units = 0;
@@ -244,9 +241,6 @@ class ShaderGLES3 {
244241
bool version_free(RID p_version);
245242

246243
static void set_shader_cache_dir(const String &p_dir);
247-
static void set_shader_cache_save_compressed(bool p_enable);
248-
static void set_shader_cache_save_compressed_zstd(bool p_enable);
249-
static void set_shader_cache_save_debug(bool p_enable);
250244

251245
RenderingServerTypes::ShaderNativeSourceCode version_get_native_source_code(RID p_version);
252246

servers/rendering/renderer_rd/renderer_compositor_rd.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,6 @@ RendererCompositorRD::RendererCompositorRD() {
317317
framebuffer_cache = memnew(FramebufferCacheRD);
318318

319319
bool shader_cache_enabled = GLOBAL_GET("rendering/shader_compiler/shader_cache/enabled");
320-
bool compress = GLOBAL_GET("rendering/shader_compiler/shader_cache/compress");
321-
bool use_zstd = GLOBAL_GET("rendering/shader_compiler/shader_cache/use_zstd_compression");
322-
bool strip_debug = GLOBAL_GET("rendering/shader_compiler/shader_cache/strip_debug");
323-
ShaderRD::set_shader_cache_save_compressed(compress);
324-
ShaderRD::set_shader_cache_save_compressed_zstd(use_zstd);
325-
ShaderRD::set_shader_cache_save_debug(!strip_debug);
326320

327321
// Shader cache is forcefully enabled when running the editor.
328322
if (shader_cache_enabled || Engine::get_singleton()->is_editor_hint()) {

servers/rendering/renderer_rd/shader_rd.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,18 +1140,6 @@ const String &ShaderRD::get_shader_cache_res_dir() {
11401140
return shader_cache_res_dir;
11411141
}
11421142

1143-
void ShaderRD::set_shader_cache_save_compressed(bool p_enable) {
1144-
shader_cache_save_compressed = p_enable;
1145-
}
1146-
1147-
void ShaderRD::set_shader_cache_save_compressed_zstd(bool p_enable) {
1148-
shader_cache_save_compressed_zstd = p_enable;
1149-
}
1150-
1151-
void ShaderRD::set_shader_cache_save_debug(bool p_enable) {
1152-
shader_cache_save_debug = p_enable;
1153-
}
1154-
11551143
Vector<RD::ShaderStageSPIRVData> ShaderRD::compile_stages(const Vector<String> &p_stage_sources, const Vector<uint64_t> &p_dynamic_buffers) {
11561144
RD::ShaderStageSPIRVData stage;
11571145
Vector<RD::ShaderStageSPIRVData> stages;
@@ -1225,9 +1213,6 @@ PackedByteArray ShaderRD::save_shader_cache_bytes(const LocalVector<int> &p_vari
12251213

12261214
String ShaderRD::shader_cache_user_dir;
12271215
String ShaderRD::shader_cache_res_dir;
1228-
bool ShaderRD::shader_cache_save_compressed = true;
1229-
bool ShaderRD::shader_cache_save_compressed_zstd = true;
1230-
bool ShaderRD::shader_cache_save_debug = true;
12311216

12321217
ShaderRD::~ShaderRD() {
12331218
LocalVector<RID> remaining = version_owner.get_owned_list();

servers/rendering/renderer_rd/shader_rd.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ class ShaderRD {
150150
static String shader_cache_user_dir;
151151
static String shader_cache_res_dir;
152152
static bool shader_cache_cleanup_on_start;
153-
static bool shader_cache_save_compressed;
154-
static bool shader_cache_save_compressed_zstd;
155-
static bool shader_cache_save_debug;
156153
bool shader_cache_user_dir_valid = false;
157154
bool shader_cache_res_dir_valid = false;
158155

@@ -255,9 +252,6 @@ class ShaderRD {
255252
static const String &get_shader_cache_user_dir();
256253
static void set_shader_cache_res_dir(const String &p_dir);
257254
static const String &get_shader_cache_res_dir();
258-
static void set_shader_cache_save_compressed(bool p_enable);
259-
static void set_shader_cache_save_compressed_zstd(bool p_enable);
260-
static void set_shader_cache_save_debug(bool p_enable);
261255

262256
static Vector<RD::ShaderStageSPIRVData> compile_stages(const Vector<String> &p_stage_sources, const Vector<uint64_t> &p_dynamic_buffers);
263257
static PackedByteArray save_shader_cache_bytes(const LocalVector<int> &p_variants, const Vector<Vector<uint8_t>> &p_variant_data);

servers/rendering/rendering_server.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3670,10 +3670,6 @@ void RenderingServer::init() {
36703670
GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/gl_compatibility/item_buffer_size", PROPERTY_HINT_RANGE, "128,1048576,1"), 16384);
36713671

36723672
GLOBAL_DEF("rendering/shader_compiler/shader_cache/enabled", true);
3673-
GLOBAL_DEF("rendering/shader_compiler/shader_cache/compress", true);
3674-
GLOBAL_DEF("rendering/shader_compiler/shader_cache/use_zstd_compression", true);
3675-
GLOBAL_DEF("rendering/shader_compiler/shader_cache/strip_debug", false);
3676-
GLOBAL_DEF("rendering/shader_compiler/shader_cache/strip_debug.release", true);
36773673

36783674
GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/reflections/sky_reflections/roughness_layers", PROPERTY_HINT_RANGE, "1,32,1"), 8);
36793675
GLOBAL_DEF_RST("rendering/reflections/sky_reflections/texture_array_reflections", true);

0 commit comments

Comments
 (0)