浏览代码

Remove buffer orphaning options project settings

These were only put in for the betas, in order to test hypotheses for stalling on Macs. It seems that most of the problems in the Mac editor have been solved by fixing the excessive redraw_requests.

As a result no one has reported any results from these options, but in future we will be able to refer users to try the beta versions, so there is no need to include them in the stable release. Indeed they are only likely to cause confusion.
lawnjelly 4 年之前
父节点
当前提交
15e57a0235

+ 1 - 1
drivers/gles2/rasterizer_canvas_base_gles2.cpp

@@ -947,7 +947,7 @@ void RasterizerCanvasBaseGLES2::draw_lens_distortion_rect(const Rect2 &p_rect, f
 
 
 void RasterizerCanvasBaseGLES2::initialize() {
 void RasterizerCanvasBaseGLES2::initialize() {
 
 
-	bool flag_stream = GLOBAL_GET("rendering/options/api_usage_legacy/flag_stream");
+	bool flag_stream = false;
 	if (flag_stream)
 	if (flag_stream)
 		_buffer_upload_usage_flag = GL_STREAM_DRAW;
 		_buffer_upload_usage_flag = GL_STREAM_DRAW;
 	else
 	else

+ 0 - 1
drivers/gles2/rasterizer_storage_gles2.cpp

@@ -6299,7 +6299,6 @@ void RasterizerStorageGLES2::initialize() {
 
 
 	config.force_vertex_shading = GLOBAL_GET("rendering/quality/shading/force_vertex_shading");
 	config.force_vertex_shading = GLOBAL_GET("rendering/quality/shading/force_vertex_shading");
 	config.use_fast_texture_filter = GLOBAL_GET("rendering/quality/filters/use_nearest_mipmap_filter");
 	config.use_fast_texture_filter = GLOBAL_GET("rendering/quality/filters/use_nearest_mipmap_filter");
-	config.should_orphan = GLOBAL_GET("rendering/options/api_usage_legacy/orphan_buffers");
 }
 }
 
 
 void RasterizerStorageGLES2::finalize() {
 void RasterizerStorageGLES2::finalize() {

+ 1 - 1
drivers/gles3/rasterizer_canvas_base_gles3.cpp

@@ -1137,7 +1137,7 @@ void RasterizerCanvasBaseGLES3::draw_window_margins(int *black_margin, RID *blac
 
 
 void RasterizerCanvasBaseGLES3::initialize() {
 void RasterizerCanvasBaseGLES3::initialize() {
 
 
-	bool flag_stream = GLOBAL_GET("rendering/options/api_usage_legacy/flag_stream");
+	bool flag_stream = false;
 	if (flag_stream) {
 	if (flag_stream) {
 		_buffer_upload_usage_flag = GL_STREAM_DRAW;
 		_buffer_upload_usage_flag = GL_STREAM_DRAW;
 	} else {
 	} else {

+ 0 - 2
drivers/gles3/rasterizer_storage_gles3.cpp

@@ -8570,8 +8570,6 @@ void RasterizerStorageGLES3::initialize() {
 			}
 			}
 		}
 		}
 	}
 	}
-
-	config.should_orphan = GLOBAL_GET("rendering/options/api_usage_legacy/orphan_buffers");
 }
 }
 
 
 void RasterizerStorageGLES3::finalize() {
 void RasterizerStorageGLES3::finalize() {

+ 0 - 4
drivers/gles_common/rasterizer_canvas_batcher.h

@@ -1052,10 +1052,6 @@ PREAMBLE(void)::batch_initialize() {
 	bdata.settings_light_max_join_items = CLAMP(bdata.settings_light_max_join_items, 0, 65535);
 	bdata.settings_light_max_join_items = CLAMP(bdata.settings_light_max_join_items, 0, 65535);
 	bdata.settings_item_reordering_lookahead = CLAMP(bdata.settings_item_reordering_lookahead, 0, 65535);
 	bdata.settings_item_reordering_lookahead = CLAMP(bdata.settings_item_reordering_lookahead, 0, 65535);
 
 
-	// allow user to override the api usage techniques using project settings
-	bdata.buffer_mode_batch_upload_send_null = GLOBAL_GET("rendering/options/api_usage_batching/send_null");
-	bdata.buffer_mode_batch_upload_flag_stream = GLOBAL_GET("rendering/options/api_usage_batching/flag_stream");
-
 	// for debug purposes, output a string with the batching options
 	// for debug purposes, output a string with the batching options
 	String batching_options_string = "OpenGL ES Batching: ";
 	String batching_options_string = "OpenGL ES Batching: ";
 	if (bdata.settings_use_batching) {
 	if (bdata.settings_use_batching) {

+ 0 - 5
servers/visual_server.cpp

@@ -2450,11 +2450,6 @@ VisualServer::VisualServer() {
 	GLOBAL_DEF("rendering/quality/2d/ninepatch_mode", 0);
 	GLOBAL_DEF("rendering/quality/2d/ninepatch_mode", 0);
 	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/2d/ninepatch_mode", PropertyInfo(Variant::INT, "rendering/quality/2d/ninepatch_mode", PROPERTY_HINT_ENUM, "Default,Scaling"));
 	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/2d/ninepatch_mode", PropertyInfo(Variant::INT, "rendering/quality/2d/ninepatch_mode", PROPERTY_HINT_ENUM, "Default,Scaling"));
 
 
-	GLOBAL_DEF_RST("rendering/options/api_usage_batching/send_null", true);
-	GLOBAL_DEF_RST("rendering/options/api_usage_batching/flag_stream", false);
-	GLOBAL_DEF_RST("rendering/options/api_usage_legacy/flag_stream", false);
-	GLOBAL_DEF_RST("rendering/options/api_usage_legacy/orphan_buffers", true);
-
 	GLOBAL_DEF("rendering/batching/options/use_batching", true);
 	GLOBAL_DEF("rendering/batching/options/use_batching", true);
 	GLOBAL_DEF_RST("rendering/batching/options/use_batching_in_editor", true);
 	GLOBAL_DEF_RST("rendering/batching/options/use_batching_in_editor", true);
 	GLOBAL_DEF("rendering/batching/options/single_rect_fallback", false);
 	GLOBAL_DEF("rendering/batching/options/single_rect_fallback", false);