diff options
| author | Anilforextra <anilforextra@gmail.com> | 2021-08-21 15:22:21 +0545 | 
|---|---|---|
| committer | Anilforextra <anilforextra@gmail.com> | 2021-08-21 19:20:07 +0545 | 
| commit | c86db8b710a575dc2a9b9cd640d06edb09b4bc72 (patch) | |
| tree | a023fcd2343610a99bb18a700a7d373bef107440 | |
| parent | 0a001afec53aa4caed7820b34db4d7d15686e24d (diff) | |
Remove redundant assignments.
Use used_in_transfer instead of used_in_compute twice.
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 4 | ||||
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 1 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/effects_rd.cpp | 4 | 
5 files changed, 3 insertions, 9 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 63510d261a..2de8b9025c 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -7957,13 +7957,13 @@ void RenderingDeviceVulkan::compute_list_bind_uniform_set(ComputeListID p_list,  				textures_to_storage[i]->used_in_compute = false;  				textures_to_storage[i]->used_in_raster = false; -				textures_to_storage[i]->used_in_compute = false; +				textures_to_storage[i]->used_in_transfer = false;  			} else {  				src_access_flags = 0;  				textures_to_storage[i]->used_in_compute = false;  				textures_to_storage[i]->used_in_raster = false; -				textures_to_storage[i]->used_in_compute = false; +				textures_to_storage[i]->used_in_transfer = false;  				textures_to_storage[i]->used_in_frame = frames_drawn;  			} diff --git a/main/main.cpp b/main/main.cpp index 6764332f16..742d9688b3 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -571,8 +571,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph  	List<String>::Element *I = args.front(); -	I = args.front(); -  	while (I) {  		I->get() = unescape_cmdline(I->get().strip_edges());  		I = I->next(); diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index d21caf4389..903398696c 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -1117,7 +1117,6 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {  				}  				item.custom_value = value;  			} -			item.rightmost_column = previous.rightmost_column;  			item.index = enum_node->values.size();  			enum_node->values.push_back(item); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 87f06445ac..d86c5110d2 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2150,7 +2150,6 @@ void TextEdit::_delete(bool p_word, bool p_all_to_right) {  		next_column = column;  	} else {  		// Delete one character -		next_column = caret.column < curline_len ? (caret.column + 1) : 0;  		if (caret_mid_grapheme_enabled) {  			next_column = caret.column < curline_len ? (caret.column + 1) : 0;  		} else { diff --git a/servers/rendering/renderer_rd/effects_rd.cpp b/servers/rendering/renderer_rd/effects_rd.cpp index 3683622d3e..80d843227b 100644 --- a/servers/rendering/renderer_rd/effects_rd.cpp +++ b/servers/rendering/renderer_rd/effects_rd.cpp @@ -2171,10 +2171,8 @@ EffectsRD::EffectsRD(bool p_prefer_raster_effects) {  			for (int pass = 0; pass < 4; pass++) {  				for (int subPass = 0; subPass < sub_pass_count; subPass++) {  					int a = pass; -					int b = subPass; -  					int spmap[5]{ 0, 1, 4, 3, 2 }; -					b = spmap[subPass]; +					int b = spmap[subPass];  					float ca, sa;  					float angle0 = (float(a) + float(b) / float(sub_pass_count)) * Math_PI * 0.5f;  |