godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44613 from lawnjelly/ewok_remove_options 

Remove buffer orphaning options project settings
This commit is contained in:
Rémi Verschelde 2020-12-23 16:47:02 +01:00 committed by GitHub
parent 9c3293b844 15e57a0235
commit ebe9d61ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles2/rasterizer_canvas_base_gles2.cpp
View File

@ -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

1
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -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() {

2
drivers/gles3/rasterizer_canvas_base_gles3.cpp
View File

@ -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 {

2
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -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() {

4
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -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) {

5
servers/visual_server.cpp
View File

@ -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);