diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-02-28 10:33:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 10:33:37 -0800 |
| commit | 3947bd13fdb00e9b21db151258c404c094b06675 (patch) | |
| tree | 68d1e4074446e843f58a1994a676e0b3339a0ede /indra/newview | |
| parent | 9a024172da94871716791174079c7f9f5eb23f45 (diff) | |
| parent | 78e7ada94bc48a7e42f96fa2b716e8f9ff8bc580 (diff) | |
Merge pull request #97 from secondlife/brad/DRTVWR-559
brad/drtvwr-559 mac shader and assert fixes
Diffstat (limited to 'indra/newview')
3 files changed, 2 insertions, 4 deletions
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/app_settings/shaders/class1/interface/splattexturerectV.glsl b/indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl index edc0a9628b..7af7f20f85 100644 --- a/indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl @@ -26,15 +26,12 @@ uniform mat4 modelview_projection_matrix; in vec3 position; -in vec4 diffuse_color; -out vec4 vertex_color; out vec2 vary_texcoord0; void main() { gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); vary_texcoord0 = position.xy*0.5+0.5; - vertex_color = diffuse_color; } diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 2eb80e0355..df12f56dd2 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 |