diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-14 11:59:38 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-14 14:13:40 -0700 |
| commit | 124c58901ddf9622eba90986336f1eaf15013b06 (patch) | |
| tree | 828b93146b804579fb56f1e5a21b13fc2fb3835f /indra/newview/app_settings/shaders | |
| parent | 1c2cf6a0f744665eb5c805a77493258712d2c540 (diff) | |
Fix shader error on mac: 'Redeclaration of sized array 'terrain_texcoord' not allowed'
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl index 65a6b8613d..f57d7eb7eb 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl @@ -242,14 +242,13 @@ void main() { case MIX_Y: #if TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 3 - TerrainCoord terrain_texcoord; terrain_texcoord[0].xy = vary_coords[2].zw; terrain_texcoord[0].zw = vary_coords[3].xy; terrain_texcoord[1].xy = vary_coords[3].zw; terrain_texcoord[1].zw = vary_coords[4].xy; terrain_texcoord[2].xy = vary_coords[4].zw; #elif TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 1 - TerrainCoord terrain_texcoord = vary_coords[0].zw; + terrain_texcoord = vary_coords[0].zw; #endif mix2 = terrain_sample_and_multiply_pbr( terrain_texcoord @@ -285,14 +284,13 @@ void main() { case MIX_Z: #if TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 3 - TerrainCoord terrain_texcoord; terrain_texcoord[0].xy = vary_coords[5].xy; terrain_texcoord[0].zw = vary_coords[5].zw; terrain_texcoord[1].xy = vary_coords[6].xy; terrain_texcoord[1].zw = vary_coords[6].zw; terrain_texcoord[2].xy = vary_coords[7].xy; #elif TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 1 - TerrainCoord terrain_texcoord = vary_coords[1].xy; + terrain_texcoord = vary_coords[1].xy; #endif mix2 = terrain_sample_and_multiply_pbr( terrain_texcoord @@ -328,14 +326,13 @@ void main() { case MIX_W: #if TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 3 - TerrainCoord terrain_texcoord; terrain_texcoord[0].xy = vary_coords[7].zw; terrain_texcoord[0].zw = vary_coords[8].xy; terrain_texcoord[1].xy = vary_coords[8].zw; terrain_texcoord[1].zw = vary_coords[9].xy; terrain_texcoord[2].xy = vary_coords[9].zw; #elif TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT == 1 - TerrainCoord terrain_texcoord = vary_coords[1].zw; + terrain_texcoord = vary_coords[1].zw; #endif mix2 = terrain_sample_and_multiply_pbr( terrain_texcoord |