Added GLSL 1.20 Starfield shaders for macOS compatibility

.github/workflows/main.yml

@@ -94,6 +94,7 @@ jobs:
     - name: 'Create DMG image'
       run: |
         rm release/shaders/stf_default.*
+        cp res/stf_compat.* release/shaders/
         mv release/*.xml release/shaders release/qt.conf release/style.qss release/*.txt release/NifSkope.app/Contents/MacOS/
         macdeployqt release/NifSkope.app -dmg
 

CHANGELOG.md

@@ -5,7 +5,7 @@
 * Skyrim and Fallout 4 shader property data is no longer moved to a sub-structure of BSLightingShaderProperty or BSEffectShaderProperty.
 * Fixed the geometry of docked widgets not being restored.
 * Fixed invisible Oblivion models with Mesa (and possibly other) OpenGL drivers.
-* Fixed error messages on macOS about unsupported GLSL version in the shaders. Note that Starfield shading is currently disabled on macOS.
+* Fixed error messages on macOS about unsupported GLSL version in the shaders.
 
 #### NifSkope-2.0.dev9-20240818
 

res/shaders/stf_default.frag

@@ -17,9 +17,7 @@ struct Material {
 	vec4	color;
 	// bit 0 = color override mode (0: multiply, 1: lerp)
 	// bit 1 = use vertex color as tint (1: yes)
-	// bits 2 to 8 = flipbook columns (0: not a flipbook)
-	// bits 9 to 15 = flipbook rows (0: not a flipbook)
-	// bits 16 to 29 = flipbook frame
+	// bit 2 = is a flipbook
 	int	flags;
 	TextureSet	textureSet;
 };
@@ -440,13 +438,6 @@ void main()
 			break;
 
 		vec2	offset = getTexCoord( lm.layers[i].uvStream );
-		if ( (lm.layers[i].material.flags & 0xFFFC) != 0 ) {
-			// flipbook
-			int	w = ( lm.layers[i].material.flags >> 2 ) & 0x7F;
-			int	h = ( lm.layers[i].material.flags >> 9 ) & 0x7F;
-			int	n = lm.layers[i].material.flags >> 16;
-			offset = ( offset + vec2( float(n % w), float(n / w) ) ) / vec2( float(w), float(h) );
-		}
 
 		float	layerMask = 1.0;
 		float	f = 1.0;
@@ -546,7 +537,7 @@ void main()
 					baseMap.a = a;
 				}
 			} else if ( lm.alphaSettings.hasOpacity && i == lm.alphaSettings.opacitySourceLayer ) {
-				if ( (lm.layers[i].material.flags & 0xFFFC) == 0 )
+				if ( (lm.layers[i].material.flags & 4) == 0 )
 					baseMap.a = getLayerTexture( i, 2, getTexCoord(lm.alphaSettings.opacityUVstream) ).r;
 				else
 					baseMap.a = getLayerTexture( i, 2, offset ).r;