diff --git a/shaders/sh_blink_extract/sh_blink_extract.fsh b/shaders/sh_blink_extract/sh_blink_extract.fsh index 918c72754..62145470f 100644 --- a/shaders/sh_blink_extract/sh_blink_extract.fsh +++ b/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; diff --git a/shaders/sh_blink_replace/sh_blink_replace.fsh b/shaders/sh_blink_replace/sh_blink_replace.fsh index 14c686a0d..c2ccbad7e 100644 --- a/shaders/sh_blink_replace/sh_blink_replace.fsh +++ b/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]; diff --git a/shaders/sh_blur_path/sh_blur_path.fsh b/shaders/sh_blur_path/sh_blur_path.fsh index 060096659..5770d72ba 100644 --- a/shaders/sh_blur_path/sh_blur_path.fsh +++ b/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; diff --git a/shaders/sh_color_picker_hue/sh_color_picker_hue.fsh b/shaders/sh_color_picker_hue/sh_color_picker_hue.fsh index 66acf331d..fa34d1ff3 100644 --- a/shaders/sh_color_picker_hue/sh_color_picker_hue.fsh +++ b/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]; diff --git a/shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.fsh b/shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.fsh index 29342903d..c81eb9f5a 100644 --- a/shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.fsh +++ b/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; diff --git a/shaders/sh_color_picker_side_value/sh_color_picker_side_value.fsh b/shaders/sh_color_picker_side_value/sh_color_picker_side_value.fsh index 1673e6f4b..b53a2be34 100644 --- a/shaders/sh_color_picker_side_value/sh_color_picker_side_value.fsh +++ b/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; diff --git a/shaders/sh_color_picker_value/sh_color_picker_value.fsh b/shaders/sh_color_picker_value/sh_color_picker_value.fsh index 826df4203..cd09196b9 100644 --- a/shaders/sh_color_picker_value/sh_color_picker_value.fsh +++ b/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; diff --git a/shaders/sh_color_remove/sh_color_remove.fsh b/shaders/sh_color_remove/sh_color_remove.fsh index 1807d47a1..0e9138636 100644 --- a/shaders/sh_color_remove/sh_color_remove.fsh +++ b/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 // diff --git a/shaders/sh_color_replace/sh_color_replace.fsh b/shaders/sh_color_replace/sh_color_replace.fsh index 023131993..6ffb9cd2a 100644 --- a/shaders/sh_color_replace/sh_color_replace.fsh +++ b/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 // diff --git a/shaders/sh_colours_replace/sh_colours_replace.fsh b/shaders/sh_colours_replace/sh_colours_replace.fsh index 3c15228db..d8a313b21 100644 --- a/shaders/sh_colours_replace/sh_colours_replace.fsh +++ b/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 // diff --git a/shaders/sh_curve/sh_curve.fsh b/shaders/sh_curve/sh_curve.fsh index e27047da1..77b126980 100644 --- a/shaders/sh_curve/sh_curve.fsh +++ b/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; diff --git a/shaders/sh_curve_hsv/sh_curve_hsv.fsh b/shaders/sh_curve_hsv/sh_curve_hsv.fsh index 0f3bc0e93..6729bb904 100644 --- a/shaders/sh_curve_hsv/sh_curve_hsv.fsh +++ b/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; diff --git a/shaders/sh_d3d_default/sh_d3d_default.fsh b/shaders/sh_d3d_default/sh_d3d_default.fsh index 83b31ea5c..a90d3596d 100644 --- a/shaders/sh_d3d_default/sh_d3d_default.fsh +++ b/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]; diff --git a/shaders/sh_dither/sh_dither.fsh b/shaders/sh_dither/sh_dither.fsh index 9a0f776c8..a3d36b9e6 100644 --- a/shaders/sh_dither/sh_dither.fsh +++ b/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; diff --git a/shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.fsh b/shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.fsh index 875fcf485..0ebc65fb6 100644 --- a/shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.fsh +++ b/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; diff --git a/shaders/sh_palette_replace/sh_palette_replace.fsh b/shaders/sh_palette_replace/sh_palette_replace.fsh index 797c7d0a9..303dba65b 100644 --- a/shaders/sh_palette_replace/sh_palette_replace.fsh +++ b/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]; diff --git a/shaders/sh_palette_shift/sh_palette_shift.fsh b/shaders/sh_palette_shift/sh_palette_shift.fsh index 9e834eedb..8dd49dc92 100644 --- a/shaders/sh_palette_shift/sh_palette_shift.fsh +++ b/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; diff --git a/shaders/sh_path_fill_profile/sh_path_fill_profile.fsh b/shaders/sh_path_fill_profile/sh_path_fill_profile.fsh index 3c21d9131..2702403b9 100644 --- a/shaders/sh_path_fill_profile/sh_path_fill_profile.fsh +++ b/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; diff --git a/shaders/sh_pixel_sample/sh_pixel_sample.fsh b/shaders/sh_pixel_sample/sh_pixel_sample.fsh index 41b473969..ffe9f2d50 100644 --- a/shaders/sh_pixel_sample/sh_pixel_sample.fsh +++ b/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; diff --git a/shaders/sh_posterize_palette/sh_posterize_palette.fsh b/shaders/sh_posterize_palette/sh_posterize_palette.fsh index 4c4133c4c..8cd6bd91d 100644 --- a/shaders/sh_posterize_palette/sh_posterize_palette.fsh +++ b/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; diff --git a/shaders/sh_region_fill_color/sh_region_fill_color.fsh b/shaders/sh_region_fill_color/sh_region_fill_color.fsh index 4b57c279e..a896aec79 100644 --- a/shaders/sh_region_fill_color/sh_region_fill_color.fsh +++ b/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; diff --git a/shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.fsh b/shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.fsh index 426348e30..148f113a2 100644 --- a/shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.fsh +++ b/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++) { diff --git a/shaders/sh_shape/sh_shape.fsh b/shaders/sh_shape/sh_shape.fsh index b5819cc93..f3d28f715 100644 --- a/shaders/sh_shape/sh_shape.fsh +++ b/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; diff --git a/shaders/sh_stripe/sh_stripe.fsh b/shaders/sh_stripe/sh_stripe.fsh index 46d7b9283..252c9626b 100644 --- a/shaders/sh_stripe/sh_stripe.fsh +++ b/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;