- [Mac] Lower shader uniform count

shaders/sh_blink_extract/sh_blink_extract.fsh

@@ -5,7 +5,11 @@ uniform float tolerance;
 uniform int   useMask;
 uniform sampler2D mask;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform vec4 colorTarget[PALETTE_LIMIT];
 uniform int colorTargetAmount;

shaders/sh_blink_replace/sh_blink_replace.fsh

@@ -4,7 +4,11 @@ varying vec4 v_vColour;
 uniform float seed;
 uniform float ratio;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform int  usePalette;
 uniform vec4 palette[PALETTE_LIMIT];

shaders/sh_blur_path/sh_blur_path.fsh

@@ -1,5 +1,11 @@
-#define CURVE_MAX 512
+
-#define MAX_POINTS 256
+#ifdef _YY_HLSL11_ 
+	#define CURVE_MAX  1024
+	#define MAX_POINTS 256
+#else 
+	#define CURVE_MAX  256
+	#define MAX_POINTS 128
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_color_picker_hue/sh_color_picker_hue.fsh

@@ -5,7 +5,11 @@ varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 uniform float hue;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform int usePalette;
 uniform vec4 palette[PALETTE_LIMIT];

shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.fsh

@@ -4,7 +4,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform float sat;
 uniform float value;

shaders/sh_color_picker_side_value/sh_color_picker_side_value.fsh

@@ -4,7 +4,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform float hue;
 uniform float sat;

shaders/sh_color_picker_value/sh_color_picker_value.fsh

@@ -4,7 +4,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform float value;
 

shaders/sh_color_remove/sh_color_remove.fsh

@@ -1,4 +1,8 @@
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 //
 // Simple passthrough fragment shader
 //

shaders/sh_color_replace/sh_color_replace.fsh

@@ -1,4 +1,8 @@
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 //
 // Simple passthrough fragment shader
 //

shaders/sh_colours_replace/sh_colours_replace.fsh

@@ -1,4 +1,8 @@
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 //
 // Simple passthrough fragment shader
 //

shaders/sh_curve/sh_curve.fsh

@@ -1,4 +1,9 @@
-#define CURVE_MAX 512
+
+#ifdef _YY_HLSL11_ 
+	#define CURVE_MAX 1024
+#else 
+	#define CURVE_MAX 256
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_curve_hsv/sh_curve_hsv.fsh

@@ -1,4 +1,9 @@
-#define CURVE_MAX 512
+
+#ifdef _YY_HLSL11_ 
+	#define CURVE_MAX 1024
+#else 
+	#define CURVE_MAX 256
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_d3d_default/sh_d3d_default.fsh

@@ -17,7 +17,16 @@ uniform int use_8bit;
 	uniform vec4  light_ambient;
 	uniform float shadowBias;
 	
-	#define LIGHT_DIR_LIMIT 16
+	#ifdef _YY_HLSL11_ 
+		#define LIGHT_DIR_LIMIT  16
+		#define LIGHT_PNT_LIMIT  16
+		#define LIGHT_PNT_LIMIT6 16*6
+	#else  
+		#define LIGHT_DIR_LIMIT  8
+		#define LIGHT_PNT_LIMIT  8
+		#define LIGHT_PNT_LIMIT6 8*6
+	#endif
+
 	uniform int	  light_dir_count;
 	uniform vec3  light_dir_direction[LIGHT_DIR_LIMIT];
 	uniform vec4  light_dir_color[LIGHT_DIR_LIMIT];
@@ -32,14 +41,13 @@ uniform int use_8bit;
 	//uniform sampler2D light_dir_shadowmap_2;
 	//uniform sampler2D light_dir_shadowmap_3;
 	
-	#define LIGHT_PNT_LIMIT 16
 	uniform int	  light_pnt_count;
 	uniform vec3  light_pnt_position[LIGHT_PNT_LIMIT];
 	uniform vec4  light_pnt_color[LIGHT_PNT_LIMIT];
 	uniform float light_pnt_intensity[LIGHT_PNT_LIMIT];
 	uniform float light_pnt_radius[LIGHT_PNT_LIMIT];
 	
-	uniform mat4  light_pnt_view[96];
+	uniform mat4  light_pnt_view[LIGHT_PNT_LIMIT6];
 	uniform mat4  light_pnt_proj[LIGHT_PNT_LIMIT];
 	uniform int   light_pnt_shadow_active[LIGHT_PNT_LIMIT];
 	uniform float light_pnt_shadow_bias[LIGHT_DIR_LIMIT];

shaders/sh_dither/sh_dither.fsh

@@ -1,7 +1,11 @@
 //
 // Simple passthrough fragment shader
 //
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.fsh

@@ -1,4 +1,8 @@
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_palette_replace/sh_palette_replace.fsh

@@ -7,7 +7,11 @@ varying vec4 v_vColour;
 uniform int		  useMask;
 uniform sampler2D mask;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 uniform vec4	colorFrom[PALETTE_LIMIT];
 uniform int		colorFrom_amo;
 uniform vec4	colorTo[PALETTE_LIMIT];

shaders/sh_palette_shift/sh_palette_shift.fsh

@@ -4,7 +4,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 uniform vec4  palette[PALETTE_LIMIT];
 uniform float paletteAmount;
 

shaders/sh_path_fill_profile/sh_path_fill_profile.fsh

@@ -1,7 +1,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define MAXPATH 1024
+#ifdef _YY_HLSL11_ 
+	#define MAXPATH 1024
+#else 
+	#define MAXPATH 256
+#endif
 
 uniform vec4 color;
 uniform vec4 bgColor;

shaders/sh_pixel_sample/sh_pixel_sample.fsh

@@ -1,4 +1,8 @@
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_posterize_palette/sh_posterize_palette.fsh

@@ -1,7 +1,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform vec4 palette[PALETTE_LIMIT];
 uniform int  keys;

shaders/sh_region_fill_color/sh_region_fill_color.fsh

@@ -4,7 +4,11 @@
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 uniform vec4  colors[PALETTE_LIMIT];
 uniform float colorAmount;
 uniform float seed;

shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.fsh

@@ -1,3 +1,9 @@
+#ifdef _YY_HLSL11_ 
+	#define SHAPE_LIMIT 1024 
+#else 
+	#define SHAPE_LIMIT 256 
+#endif
+
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
@@ -11,7 +17,7 @@ void main() {
 	vec2 pxPos = v_vTexcoord * vec2(float(maxShape), 1.) - 0.5;
 	
 	int amo = 0;
-	vec4 list[1024];
+	vec4 list[SHAPE_LIMIT];
 	
 	for(float i = 0.; i <= dimension.x; i++)
 	for(float j = 0.; j <= dimension.y; j++) {

shaders/sh_shape/sh_shape.fsh

@@ -1,5 +1,10 @@
 // 2D Signed Distance equations by InigoQuilez
-#define CURVE_MAX 512
+
+#ifdef _YY_HLSL11_ 
+	#define CURVE_MAX 1024
+#else 
+	#define CURVE_MAX 512
+#endif
 
 varying vec2 v_vTexcoord;
 varying vec4 v_vColour;

shaders/sh_stripe/sh_stripe.fsh

@@ -2,7 +2,11 @@ varying vec2 v_vTexcoord;
 varying vec4 v_vColour;
 
 #define PI 3.14159265359
-#define PALETTE_LIMIT 1024
+#ifdef _YY_HLSL11_ 
+	#define PALETTE_LIMIT 1024 
+#else 
+	#define PALETTE_LIMIT 256 
+#endif
 
 uniform float seed;
 uniform vec2  dimension;