Browse Source

Remove redundant assignments.
Use used_in_transfer instead of used_in_compute twice.

Anilforextra 4 years ago
parent
commit
c86db8b710

+ 2 - 2
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_compute = false;
 				textures_to_storage[i]->used_in_raster = 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 {
 			} else {
 				src_access_flags = 0;
 				src_access_flags = 0;
 				textures_to_storage[i]->used_in_compute = false;
 				textures_to_storage[i]->used_in_compute = false;
 				textures_to_storage[i]->used_in_raster = 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;
 				textures_to_storage[i]->used_in_frame = frames_drawn;
 			}
 			}
 
 

+ 0 - 2
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();
 	List<String>::Element *I = args.front();
 
 
-	I = args.front();
-
 	while (I) {
 	while (I) {
 		I->get() = unescape_cmdline(I->get().strip_edges());
 		I->get() = unescape_cmdline(I->get().strip_edges());
 		I = I->next();
 		I = I->next();

+ 0 - 1
modules/gdscript/gdscript_parser.cpp

@@ -1117,7 +1117,6 @@ GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
 				}
 				}
 				item.custom_value = value;
 				item.custom_value = value;
 			}
 			}
-			item.rightmost_column = previous.rightmost_column;
 
 
 			item.index = enum_node->values.size();
 			item.index = enum_node->values.size();
 			enum_node->values.push_back(item);
 			enum_node->values.push_back(item);

+ 0 - 1
scene/gui/text_edit.cpp

@@ -2150,7 +2150,6 @@ void TextEdit::_delete(bool p_word, bool p_all_to_right) {
 		next_column = column;
 		next_column = column;
 	} else {
 	} else {
 		// Delete one character
 		// Delete one character
-		next_column = caret.column < curline_len ? (caret.column + 1) : 0;
 		if (caret_mid_grapheme_enabled) {
 		if (caret_mid_grapheme_enabled) {
 			next_column = caret.column < curline_len ? (caret.column + 1) : 0;
 			next_column = caret.column < curline_len ? (caret.column + 1) : 0;
 		} else {
 		} else {

+ 1 - 3
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 pass = 0; pass < 4; pass++) {
 				for (int subPass = 0; subPass < sub_pass_count; subPass++) {
 				for (int subPass = 0; subPass < sub_pass_count; subPass++) {
 					int a = pass;
 					int a = pass;
-					int b = subPass;
-
 					int spmap[5]{ 0, 1, 4, 3, 2 };
 					int spmap[5]{ 0, 1, 4, 3, 2 };
-					b = spmap[subPass];
+					int b = spmap[subPass];
 
 
 					float ca, sa;
 					float ca, sa;
 					float angle0 = (float(a) + float(b) / float(sub_pass_count)) * Math_PI * 0.5f;
 					float angle0 = (float(a) + float(b) / float(sub_pass_count)) * Math_PI * 0.5f;