Skip to content

Commit d659f56

Browse files
OhadMeirNir-Az
authored andcommitted
PR #14021 from Nir-Az: Change GLSL for processing default to off
(cherry picked from commit e9e0bb6)
1 parent 726ee47 commit d659f56

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

common/device-model.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ namespace rs2
159159
namespace performance
160160
{
161161
static const char* glsl_for_rendering{ "performance.glsl_for_rendering.v2" };
162-
static const char* glsl_for_processing{ "performance.glsl_for_processing.v2" };
162+
static const char* glsl_for_processing{ "performance.glsl_for_processing.v3" };
163163
static const char* enable_msaa{ "performance.msaa" };
164164
static const char* msaa_samples{ "performance.msaa_samples" };
165165
static const char* show_fps{ "performance.show_fps" };

common/ux-window.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ namespace rs2
105105

106106
config_file::instance().set_nested_default(configurations::dds::enable_dds, false);
107107
config_file::instance().set_nested_default(configurations::dds::domain_id, 0);
108+
108109
#ifdef __APPLE__
109110

110111
config_file::instance().set_default(configurations::performance::font_oversample, 2);
@@ -158,6 +159,10 @@ namespace rs2
158159
config_file::instance().set_default(configurations::viewer::shading_mode, 0);
159160
}
160161
#endif
162+
163+
// Since we have seen on several laptops models that using GLSL for processing cause a memory leak decided to disable it by default
164+
// Users can still enable it if they wish
165+
config_file::instance().set_default(configurations::performance::glsl_for_processing, false);
161166
}
162167

163168
void ux_window::reload()

0 commit comments

Comments
 (0)