diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-02-25 22:24:46 -0800 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-02-25 22:24:46 -0800 |
| commit | 46b2c0660a091f5b3596084a71f63c8145bfac68 (patch) | |
| tree | 08c8b09e15c2247e10d3d4ac7d73e6a697803086 | |
| parent | b0fb4e3b7c6762d2f63ae349490c264e42809f60 (diff) | |
Hammering on more mac optimizations.
SL-18563
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index b3b79bd6c4..50d4532fa7 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1408,8 +1408,11 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt LL_PROFILE_ZONE_NUM(height); free_cur_tex_image(); -#if 0 - glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels); +#if LL_DARWIN + { + LL_PROFILE_ZONE_NAMED("glTexImage2D alloc"); + glTexImage2D(target, miplevel, intformat, width, height, 0, pixformat, pixtype, use_scratch ? scratch : pixels); + } #else // break up calls to a manageable size for the GL command buffer { diff --git a/indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl b/indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl index 8e341503f5..188fac5460 100644 --- a/indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/gaussianF.glsl @@ -41,7 +41,7 @@ void main() { vec3 col = vec3(0,0,0); - float w[] = { 0.0002, 0.0060, 0.0606, 0.2417, 0.3829, 0.2417, 0.0606, 0.0060, 0.0002 }; + float w[9] = float[9]( 0.0002, 0.0060, 0.0606, 0.2417, 0.3829, 0.2417, 0.0606, 0.0060, 0.0002 ); for (int i = 0; i < 9; ++i) { diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index afe95c86d9..c90e4d6dbc 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -71,6 +71,7 @@ RenderGLMultiThreaded 1 0 RenderReflectionsEnabled 1 1 RenderReflectionProbeDetail 1 2 RenderScreenSpaceReflections 1 1 +RenderReflectionProbeCount 1 8 // // Low Graphics Settings |