Qt: Allow recording on game boot #12363

F0bes · 2025-02-26T22:01:15Z

Updated version of #12321

Due to their PR being on their master branch I don't have access to implement changes, and I don't want the PR to go stale.

------------------------------------------------------------------------------------------ libfreeaptx.mk ad6748ac8b2ebbfae7d0c5608434f60592d61edc # Version: Commits on Feb 26, 2025 ------------------------------------------------------------------------------------------ Update to 0.2.1 - Rebase git history to upstream libopenaptx 0.2.0-5eb14ed, ----------------------------------------------------------------------------------------------- uboot-odroid-goa.mk 154ddfc826e72c902232169b676b2a4e59c75171 # Version: Commits on Apr 25, 2022 ----------------------------------------------------------------------------------------------- ODROID-N2L: Support DDR3200 (1608MHz) for samsung lpddr4x 2GB/4GB. Signed-off-by: ckkim <changkon12@gmail.com> Change-Id: I521a3a53015a5cb4a2b1a5db36959725e16c14b8, -------------------------------------------------------------------------------------------------- uboot-powkiddy-a13.mk e2c76fb6b0f89c5385273b3a83fbd2ce16903396 # Version: Commits on Sept 13, 2021 -------------------------------------------------------------------------------------------------- rockchip: atags: add boot type for sata and pcie Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com> Change-Id: I83fe8fef7f542d91787c3db82a94785390fa88cd, -------------------------------------------------------------------------------------------- uboot-ps5000.mk e2c76fb6b0f89c5385273b3a83fbd2ce16903396 # Version: Commits on Sept 13, 2021 -------------------------------------------------------------------------------------------- rockchip: atags: add boot type for sata and pcie Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com> Change-Id: I83fe8fef7f542d91787c3db82a94785390fa88cd, -------------------------------------------------------------------------------------------- uboot-ps7000.mk e2c76fb6b0f89c5385273b3a83fbd2ce16903396 # Version: Commits on Sept 13, 2021 -------------------------------------------------------------------------------------------- rockchip: atags: add boot type for sata and pcie Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com> Change-Id: I83fe8fef7f542d91787c3db82a94785390fa88cd, ------------------------------------------------------------------------------------------- uboot-rk3588.mk 2f6e967dc901ae570f522d1b47309e7c34acf542 # Version: Commits on Mar 21, 2023 ------------------------------------------------------------------------------------------- Updated memspec and bl31 Signed-off-by: Steve Hay <me@stevenhay.com>, ------------------------------------------------------------------------------------------------- uboot-visionfive2.mk 03694ca1885e8b2ec34ea235106f1b8abe2fa903 # Version: Commits on Sept 27, 2024 ------------------------------------------------------------------------------------------------- Update submodule commit id for tag JH7110_VF2_515_v5.13.1, --------------------------------------------------------------------------------------- amiberry.mk bed58999e6c240f29c8f3919416130e7a5f8e561 # Version: Commits on Feb 27, 2025 --------------------------------------------------------------------------------------- enhancement: add a default Dark theme (fixes #1639) (#1640), ------------------------------------------------------------------------------------ citra.mk 89727377270380ed301bee2e695e4ffb212d6120 # Version: Commits on Feb 27, 2025 ------------------------------------------------------------------------------------ vk_instance.h: Add more tile-based GPUs to the list of `ShouldFlush()` (#360) GPUs that are primarily tile-based (ex. Mali, Adreno, PowerVR, etc.) benefit from flushing at the end of each major renderpass., ------------------------------------------------------------------------------------------ dolphin-emu.mk 65726b7b5f005ce90dd38a20fe3c06c4b1338b10 # Version: Commits on Feb 27, 2025 ------------------------------------------------------------------------------------------ Merge pull request #13374 from Dentomologist/performancemetrics_clamping_resetting_and_add_setting PerformanceMetrics: Add clamping, resetting on resize, and setting, ------------------------------------------------------------------------------------------------- duckstation-legacy.mk f7f17a077c704f4008feaf79938185e71bceb67d # Version: Commits on Feb 26, 2025 ------------------------------------------------------------------------------------------------- Cheats: Add Enable8MBRAM option for patches, -------------------------------------------------------------------------------------- flycast.mk d23b3b6bc76853327235f119f5e53d5b472b4ebf # Version: Commits on Feb 27, 2025 -------------------------------------------------------------------------------------- rcheevos: include flycast version in user-agent header Issue #1798, ----------------------------------------------------------------------------------------------- lindbergh-loader.mk 52cb3eaf6b156283b6b8968bdb3def084184227f # Version: Commits on Feb 27, 2025 ----------------------------------------------------------------------------------------------- Workaround 2, ---------------------------------------------------------------------------------------- model2emu.mk 57b5cff598e63ca688a9a58f3b341104e43c4b01 # Version: Commits on May 15, 2022 ---------------------------------------------------------------------------------------- Update README.md update readme, ---------------------------------------------------- pcsx2.mk v2.3.185 # Version: Commits on Feb 26, 2025 ---------------------------------------------------- - [Qt: Allow recording on game boot](https://github.com/PCSX2/pcsx2/pull/12363) , ------------------------------------------------------------------------------------- ppsspp.mk 4838721ec242517c5a8da2748058bf1caa1b35ed # Version: Commits on Feb 27, 2025 ------------------------------------------------------------------------------------- Merge pull request #20045 from hrydgard/merge-roliverosc Merge roliverosc' ES_es translation update, ------------------------------------------------------------------------------------ rpcs3.mk 207ee59acd7e8b0ed9eb212e890f8635c3b018f2 # Version: Commits on Feb 23, 2025 ------------------------------------------------------------------------------------ PPU Analyzer: Firmware/import caller analysis and KLIC finding pass, ----------------------------------------------------------------------------------------- supermodel.mk 112e7bb9b4ac666c987e0b60c54a86038ed0ad41 # Version: Commits on Feb 27, 2025 ----------------------------------------------------------------------------------------- Merge pull request #234 from gm-matthew/tile-pairs Fixing tilegen bugs in Scud Race, --------------------------------------------------------------------------------------- thextech.mk ec8d5cc9bf9c75f42586ab1d9ab74858238ccac8 # Version: Commits on Feb 27, 2025 --------------------------------------------------------------------------------------- player_death_logic.cpp: inherit music from followed player, -------------------------------------------------------------------------------------- tsugaru.mk fc06db8a94ef458309cb5e58b7f640bc2f6c3800 # Version: Commits on Feb 27, 2025 -------------------------------------------------------------------------------------- Re-enabled PAUSE (default Scroll Lock) key., ------------------------------------------------- vice.mk r45509 # Version: Commits on Feb 27, 2025 ------------------------------------------------- Gtk3: Add label \Master volume\ in front of volume slider In the settings node \Audio\ -> \Sound driver\, add a label next to the volume slider to avoid confusion for certain citrus people. git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45509 379a1393-f5fb-40a0-bcee-ef074d9b53f7, ---------------------------------------------------------- xenia-canary.mk fbacd3c # Version: Commits on Feb 07, 2025 ---------------------------------------------------------- [Xam/Xam_NUI] - Implement XamShowNuiHardwareRequiredUI - Implement XamShowNuiHardwareRequiredUI - Add notes to XamShowNuiTroubleshooterUI, ------------------------------------------------------------------------------------------- jazz2-native.mk 64928b55b824cbee8f68e724c25b661c5f272a85 # Version: Commits on Feb 27, 2025 ------------------------------------------------------------------------------------------- Refactoring, ---------------------------------------------------------------------------------- stk.mk 6623872d8725e5a6a4372e665123455da9da14e5 # Version: Commits on Feb 27, 2025 ---------------------------------------------------------------------------------- Add Georgian font (#5313), --------------------------------------------------------------------------------------------- easyrpg-player.mk a9234966714b4a37a36b6dc6b5f88c05e1ea61f3 # Version: Commits on Feb 27, 2025 --------------------------------------------------------------------------------------------- Merge pull request #3358 from JenkinsRPG/translation Android: Sync translations, ----------------------------------------------------- shaderc.mk v2025.1 # Version: Commits on Feb 27, 2025 ----------------------------------------------------- Finalize Shaderc v2025.1 Skip version numbers so we match SPIRV-Tools. Do this to avoid confusion when included in the Vulkan SDK, ---------------------------------------------------------------------------------------- doomretro.mk 1a46ca8949b96b549dc808433a5c7a02719b1dba # Version: Commits on Feb 27, 2025 ---------------------------------------------------------------------------------------- Update to Visual Studio v17.13.2, ------------------------------------------------------------------------------------- gzdoom.mk b0d6f143f6c01e267a878c149b228613593aa7cf # Version: Commits on Feb 27, 2025 ------------------------------------------------------------------------------------- - fix classic doom.doom filter, ----------------------------------------------------------------------------------------- sonic3-air.mk 81b88461a58503977d38cc1868080323141f0014 # Version: Commits on Feb 26, 2025 ----------------------------------------------------------------------------------------- Fix for a small visual glitch after the CNZ 2 Knuckles cutscene just before the boss, ----------------------------------------------------------------------------------- tr1x.mk 7e4ceb62ed0b88badb1c60bfe57db0760823b5cf # Version: Commits on Feb 26, 2025 ----------------------------------------------------------------------------------- tr1/controls: hide the reset and unbind texts when changing keys (#2555) Resolves #2103., ----------------------------------------------------------------------------------- tr2x.mk 7e4ceb62ed0b88badb1c60bfe57db0760823b5cf # Version: Commits on Feb 26, 2025 ----------------------------------------------------------------------------------- tr1/controls: hide the reset and unbind texts when changing keys (#2555) Resolves #2103., ----------------------------------------------------------------------------------------------- libretro-easyrpg.mk a9234966714b4a37a36b6dc6b5f88c05e1ea61f3 # Version: Commits on Feb 27, 2025 ----------------------------------------------------------------------------------------------- Merge pull request #3358 from JenkinsRPG/translation Android: Sync translations, --------------------------------------------------------------------------------------------- libretro-fbneo.mk 706e741e5d8cca09f140f1d679367d350ea1def6 # Version: Commits on Feb 27, 2025 --------------------------------------------------------------------------------------------- (libretro) attempt at forcing android api level 18, ----------------------------------------------------------------------------------------------- libretro-flycast.mk d23b3b6bc76853327235f119f5e53d5b472b4ebf # Version: Commits on Feb 27, 2025 ----------------------------------------------------------------------------------------------- rcheevos: include flycast version in user-agent header Issue #1798, ------------------------------------------------------------ libretro-mame.mk mame0275 # Version: Commits on Feb 27, 2025 ------------------------------------------------------------ mame0275 -------------------------------------------------------------------------------------------- libretro-mgba.mk abb46602caf705a58514cdae7d8f5f28eb4a3c14 # Version: Commits on Feb 27, 2025 -------------------------------------------------------------------------------------------- GB: Allow use of CGB-E and AGB-0 BIOS versions (closes #3427), ---------------------------------------------------------------------------------------------- libretro-ppsspp.mk 4838721ec242517c5a8da2748058bf1caa1b35ed # Version: Commits on Feb 27, 2025 ---------------------------------------------------------------------------------------------- Merge pull request #20045 from hrydgard/merge-roliverosc Merge roliverosc' ES_es translation update, ------------------------------------------------------------------------------------------- glsl-shaders.mk 326507d57214a290320f581c01a24443c394d6ff # Version: Commits on Feb 26, 2025 ------------------------------------------------------------------------------------------- patch: @@ -4,7 +4,6 @@ Bezels code is a modified version of this shadertoy: https://www.shadertoy.com/view/XdtfzX */ - /* Hyllian's crt-nobody Shader @@ -31,59 +30,74 @@ #version 120 -#pragma parameter all_nonono \ALL:\ 0.0 0.0 1.0 1.0 -#pragma parameter all_zoom \ Zoom %\ 100.0 20.0 200.0 1.0 - -#pragma parameter frame_nonono \FRAME:\ 0.0 0.0 1.0 1.0 -#pragma parameter fr_zoom \ Zoom %\ 100.0 20.0 200.0 1.0 -#pragma parameter fr_scale_x \ Scale X%\ 75.0 20.0 200.0 0.2 -#pragma parameter fr_scale_y \ Scale Y%\ 100.0 20.0 200.0 0.2 -#pragma parameter fr_center_x \ Center X\ 0.0 -100.0 100.0 0.1 -#pragma parameter fr_center_y \ Center Y\ 0.0 -100.0 100.0 0.1 - -#pragma parameter bz_nonono \BEZEL:\ 0.0 0.0 1.0 1.0 -#pragma parameter bz_lights \ Lights [ OUT | ON ]\ 1.0 0.0 1.0 1.0 -#pragma parameter bz_shine_enable \ Shine [ OFF | ON ]\ 1.0 0.0 1.0 1.0 -#pragma parameter bz_ambient_enable \ Ambient [ OFF | ON ]\ 1.0 0.0 1.0 1.0 -#pragma parameter bz_width \ Content Width\ 0.66 0.1 1.0 0.005 -#pragma parameter bz_height \ Content Height\ 0.66 0.1 1.0 0.005 -#pragma parameter bz_ref_str \ Relflection Strength\ 0.25 0.0 1.0 0.01 -#pragma parameter bz_inner_bezel_x \ Inner Bezel Width\ 0.1 0.0 1.0 0.01 -#pragma parameter bz_inner_bezel_y \ Inner Bezel Height\ 0.1 0.0 1.0 0.01 -#pragma parameter bz_middle_bezel_x \ Middle Bezel Width\ 0.2 0.0 1.0 0.01 -#pragma parameter bz_middle_bezel_y \ Middle Bezel Height\ 0.2 0.0 1.0 0.01 -#pragma parameter bz_outer_bezel_x \ Outer Bezel Width\ 0.3 0.0 1.0 0.01 -#pragma parameter bz_outer_bezel_y \ Outer Bezel Height\ 0.3 0.0 1.0 0.01 -#pragma parameter bz_outer_curve \ Bezels Curvature [ OFF | ON ]\ 0.0 0.0 1.0 1.0 -#pragma parameter bz_radius \ Bezel Corner Radius\ 0.05 0.005 1.0 0.01 -#pragma parameter bz_red \ Bezel Color - Red\ 128.0 0.0 255.0 1.0 -#pragma parameter bz_green \ Bezel Color - Green\ 128.0 0.0 255.0 1.0 -#pragma parameter bz_blue \ Bezel Color - Blue\ 128.0 0.0 255.0 1.0 -#pragma parameter bz_ref_dist \ Reflection Distance\ 0.0 -0.6 0.6 0.01 -#pragma parameter bz_shine \ Shine Intensity\ 0.25 0.0 1.0 0.01 -#pragma parameter bz_shine_size \ Shine Size\ 0.75 0.0 1.0 0.01 -#pragma parameter bz_ambient \ Ambient Intensity\ 0.15 0.0 1.0 0.01 -#pragma parameter bz_ambient_size \ Ambient Size\ 0.85 0.0 1.0 0.01 -#pragma parameter bz_ang \ Inflec. Point Angle\ 1.0 0.0 20.0 0.01 -#pragma parameter bz_pos \ Inflec. Point Position\ 0.0 -20.0 20.0 0.002 - -#pragma parameter border_nonono \BORDER:\ 0.0 0.0 1.0 1.0 -#pragma parameter ub_border_top \ On top: [ Frame | Border ]\ 0.0 0.0 1.0 1.0 -#pragma parameter border_scale \ Border Scale\ 1.0 0.5 5.0 0.002 -#pragma parameter border_center_x \ Border Center X\ 0.0 -0.5 0.5 0.001 -#pragma parameter border_center_y \ Border Center Y\ 0.0 -0.5 0.5 0.001 -#pragma parameter border_mirror_y \ Border Mirror (Y)\ 0.0 0.0 1.0 1.0 - -#pragma parameter h_nonono \HYLLIAN'S CURVATURE:\ 1.0 0.0 1.0 1.0 -#pragma parameter h_curvature \ Curvature Toggle\ 1.0 0.0 1.0 1.0 -#pragma parameter h_shape \ Shape [ Sphere | Cylinder ]\ 0.0 0.0 1.0 1.0 -#pragma parameter h_radius \ Curvature Radius\ 4.0 1.5 10.0 0.1 -#pragma parameter h_cornersize \ Corner Size\ 0.05 0.01 1.0 0.01 -#pragma parameter h_cornersmooth \ Corner Smoothness\ 0.5 0.1 1.0 0.1 -#pragma parameter h_angle_x \ Position X\ 0.0 -1.0 1.0 0.001 -#pragma parameter h_angle_y \ Position Y\ 0.0 -1.0 1.0 0.001 -#pragma parameter h_overscan_x \ Overscan X%\ 100.0 20.0 200.0 0.2 -#pragma parameter h_overscan_y \ Overscan Y%\ 100.0 20.0 200.0 0.2 + +#pragma parameter ubo_nonono \[ UBORDER USER PARAMS ]\ 1.0 0.0 1.0 1.0 + +#pragma parameter frame_nonono \FRAME:\ 0.0 0.0 1.0 1.0 +#pragma parameter fr_aspect_x \ Set Aspect Ratio Numerator\ 8.0 1.0 32.0 0.02 +#pragma parameter fr_aspect_y \ Set Aspect Ratio Denominator\ 6.0 1.0 32.0 0.02 +#pragma parameter fr_zoom \ Zoom %\ 50.0 2.0 200.0 0.2 +#pragma parameter fr_i_scaling \ Use Integer Scaling for Y\ 0.0 0.0 1.0 1.0 +#pragma parameter fr_i_scaling_fac \ Integer Scaling Factor [ - / + ]\ 0.0 -20.0 1.0 1.0 +#pragma parameter fr_center_x \ Center X\ 0.0 -200.0 200.0 0.1 +#pragma parameter fr_center_y \ Center Y\ 0.0 -200.0 200.0 0.1 + +#pragma parameter all_nonono \ALL:\ 0.0 0.0 1.0 1.0 +#pragma parameter all_zoom \ Zoom %\ 100.0 20.0 200.0 1.0 + +#pragma parameter bz_nonono \BEZEL:\ 0.0 0.0 1.0 1.0 +#pragma parameter bz_lights \ Lights [ OUT | ON ]\ 1.0 0.0 1.0 1.0 +#pragma parameter bz_shine_enable \ Shine [ OFF | ON ]\ 1.0 0.0 1.0 1.0 +#pragma parameter bz_ambient_enable \ Ambient [ OFF | ON ]\ 1.0 0.0 1.0 1.0 +#pragma parameter bz_blur_iter \ Reflection Quality/Performance\ 5.0 5.0 32.0 1.0 +#pragma parameter bz_ref_str \ Reflection Strength\ 0.25 0.0 1.0 0.01 +#pragma parameter bz_inner_bezel_x \ Bezel Inner Width\ 0.1 0.0 1.0 0.001 +#pragma parameter bz_inner_bezel_y \ Bezel Inner Height\ 0.1 0.0 1.0 0.001 +#pragma parameter bz_middle_bezel_x \ Bezel Middle Width\ 0.2 0.0 1.0 0.001 +#pragma parameter bz_middle_bezel_y \ Bezel Middle Height\ 0.2 0.0 1.0 0.001 +#pragma parameter bz_outer_bezel_x \ Bezel Outer Width\ 0.3 0.0 1.0 0.001 +#pragma parameter bz_outer_bezel_y \ Bezel Outer Height\ 0.3 0.0 1.0 0.001 +#pragma parameter bz_transparent \ Bezel Transparent [ OFF | ON ]\ 0.0 0.0 1.0 1.0 +#pragma parameter bz_outer_curve \ Bezel Curvature [ OFF | ON ]\ 0.0 0.0 1.0 1.0 +#pragma parameter bz_radius \ Bezel Corner Radius\ 0.05 0.005 1.0 0.01 +#pragma parameter bz_center_x \ Bezel Center X\ 0.0 -200.0 200.0 0.1 +#pragma parameter bz_center_y \ Bezel Center Y\ 0.0 -200.0 200.0 0.1 +#pragma parameter bz_red \ Bezel Color - Red\ 128.0 0.0 255.0 1.0 +#pragma parameter bz_green \ Bezel Color - Green\ 128.0 0.0 255.0 1.0 +#pragma parameter bz_blue \ Bezel Color - Blue\ 128.0 0.0 255.0 1.0 +#pragma parameter bz_ref_dist \ Reflection Distance\ 0.0 -0.6 0.6 0.01 +#pragma parameter bz_shine \ Shine Intensity\ 0.25 0.0 1.0 0.01 +#pragma parameter bz_shine_size \ Shine Size\ 0.75 0.0 1.0 0.01 +#pragma parameter bz_ambient \ Ambient Intensity\ 0.15 0.0 1.0 0.01 +#pragma parameter bz_ambient_size \ Ambient Size\ 0.85 0.0 1.0 0.01 +#pragma parameter bz_ang \ Inflec. Point Angle\ 1.0 0.0 20.0 0.01 +#pragma parameter bz_pos \ Inflec. Point Position\ 0.0 -20.0 20.0 0.002 + +#pragma parameter border_nonono \BORDER:\ 0.0 0.0 1.0 1.0 +#pragma parameter ub_border_top \ On top: [ Frame | Border ]\ 0.0 0.0 1.0 1.0 +#pragma parameter border_scale \ Border Scale\ 1.0 0.5 5.0 0.002 +#pragma parameter border_center_x \ Border Center X\ 0.0 -0.5 0.5 0.001 +#pragma parameter border_center_y \ Border Center Y\ 0.0 -0.5 0.5 0.001 +#pragma parameter border_mirror_y \ Border Mirrored\ 0.0 0.0 1.0 1.0 +#pragma parameter border_allow_rot \ Border Rotation [ 0 <--> 270 ]\ 0.0 0.0 3.0 1.0 +#pragma parameter border_alpha \ Border Alpha Over Content (BAOC)\0.0 0.0 1.0 0.01 +#pragma parameter black_baoc \ (BAOC) Emphasis on Content\ 0.0 0.0 1.0 1.0 +#pragma parameter border_weight \ Border to Ambient-Light Weight\ 0.5 0.0 1.0 0.05 +#pragma parameter border_dimming \ Border Dimming (Lights OUT)\ 0.5 0.0 1.0 0.05 +//#pragma parameter layer2_dimming \ Layer2 Dimming (Lights OUT)\ 0.5 0.0 1.0 0.05 + +#pragma parameter h_nonono \HYLLIAN'S CURVATURE:\ 1.0 0.0 1.0 1.0 +#pragma parameter h_curvature \ Curvature Toggle\ 1.0 0.0 1.0 1.0 +#pragma parameter h_shape \ Shape [ Sphere | Cylinder ]\ 0.0 0.0 1.0 1.0 +#pragma parameter h_radius \ Curvature Radius\ 4.0 1.8 10.0 0.1 +#pragma parameter h_cornersize \ Corner Size\ 0.05 0.01 1.0 0.01 +#pragma parameter h_cornersmooth \ Corner Smoothness\ 0.5 0.1 1.0 0.1 +#pragma parameter h_x_tilt \ Horizontal Tilt\ 0.0 -0.5 0.5 0.01 +#pragma parameter h_y_tilt \ Vertical Tilt\ 0.0 -0.5 0.5 0.01 +#pragma parameter h_angle_x \ Position X\ 0.0 -1.0 1.0 0.001 +#pragma parameter h_angle_y \ Position Y\ 0.0 -1.0 1.0 0.001 +#pragma parameter h_overscan_x \ Overscan X%\ 100.0 20.0 200.0 0.2 +#pragma parameter h_overscan_y \ Overscan Y%\ 100.0 20.0 200.0 0.2 #pragma parameter CN_NONONO \CRT-NOBODY:\ 0.0 0.0 1.0 1.0 #pragma parameter CN_BEAM_MIN_WIDTH \ Min Beam Width\ 0.80 0.0 1.0 0.01 @@ -100,6 +114,7 @@ #pragma parameter CN_InputGamma \ Input Gamma\ 2.4 0.0 4.0 0.1 #pragma parameter CN_OutputGamma \ Output Gamma\ 2.2 0.0 3.0 0.1 +#if defined(VERTEX) #if __VERSION__ >= 130 #define COMPAT_VARYING out @@ -117,60 +132,241 @@ #define COMPAT_PRECISION #endif + +COMPAT_ATTRIBUTE vec4 VertexCoord; +COMPAT_ATTRIBUTE vec4 COLOR; +COMPAT_ATTRIBUTE vec4 TexCoord; +COMPAT_VARYING vec4 COL0; +COMPAT_VARYING vec4 TEX0; + +uniform mat4 MVPMatrix; uniform COMPAT_PRECISION int FrameDirection; uniform COMPAT_PRECISION int FrameCount; uniform COMPAT_PRECISION int Rotation; uniform COMPAT_PRECISION vec2 OutputSize; uniform COMPAT_PRECISION vec2 TextureSize; uniform COMPAT_PRECISION vec2 InputSize; +uniform COMPAT_PRECISION vec2 OrigTextureSize; -// compatibility #defines +COMPAT_VARYING vec2 uv; +COMPAT_VARYING vec2 border_uv; +COMPAT_VARYING vec2 bezel_uv; +COMPAT_VARYING vec4 intl_profile; +COMPAT_VARYING vec2 mask_size; + +// vertex compatibility #defines #define vTexCoord TEX0.xy -//#define SourceSize vec4(TextureSize, 1.0 / TextureSize) //either TextureSize or InputSize -#define SourceSize vec4(InputSize, 1.0 / TextureSize) //It works this way only! +#define SourceSize vec4(TextureSize, 1.0 / TextureSize) //either TextureSize or InputSize #define OutSize vec4(OutputSize, 1.0 / OutputSize) +#define OrigTexSize vec4(OrigTextureSize, 1.0 / OrigTextureSize) + +#define ub_OutputSize OutSize +#define ub_OriginalSize OrigTexSize +#define ub_Rotation Rotation + +#define InputToTextureSizeRatio (InputSize.xy / TextureSize.xy) + + +#ifdef PARAMETER_UNIFORM +uniform COMPAT_PRECISION float all_zoom; +uniform COMPAT_PRECISION float fr_aspect_x; +uniform COMPAT_PRECISION float fr_aspect_y; +uniform COMPAT_PRECISION float fr_zoom; +uniform COMPAT_PRECISION float fr_i_scaling; +uniform COMPAT_PRECISION float fr_i_scaling_fac; +uniform COMPAT_PRECISION float fr_center_x; +uniform COMPAT_PRECISION float fr_center_y; +uniform COMPAT_PRECISION float bz_center_x; +uniform COMPAT_PRECISION float bz_center_y; +uniform COMPAT_PRECISION float border_scale; +uniform COMPAT_PRECISION float border_center_x; +uniform COMPAT_PRECISION float border_center_y; +uniform COMPAT_PRECISION float border_mirror_y; +uniform COMPAT_PRECISION float border_allow_rot; +uniform COMPAT_PRECISION float h_curvature; +#endif + +#define CN_OFFSET 0.5 +#define CN_SCAN_OFFSET 0.0 + +vec2 get_rotated_size(vec2 x, int rotation) { + if (rotation == 0 || rotation == 2) return x; + else return x.yx; +} + + +vec2 get_rotated_vector(vec2 x, int rotation) { + if (rotation == 0) return x; + else if (rotation == 1) return vec2(-x.y, x.x); + else if (rotation == 2) return -x; + else return vec2(x.y, -x.x); +} + +// Use to unrotate coordinates. +// It expects coordinates centered at (0.5,0.5). +vec2 get_unrotated_coords(vec2 x, int rotation) { + if (rotation == 0) return x; + else if (rotation == 1) return vec2(x.y, 1.0-x.x); + else if (rotation == 2) return 1.0-x; + else return vec2(1.0-x.y, x.x); +} + +const vec2 middle = vec2(0.5); + +float is_rotated = mod(float(ub_Rotation), 2.); + +vec2 fr_center = get_rotated_vector(vec2(fr_center_x, fr_center_y)/100.0, ub_Rotation); +float allzoom = all_zoom/100.0; + +vec2 OutputRotSize = get_rotated_size( ub_OutputSize.xy, ub_Rotation); +vec2 OriginalRotInvSize = get_rotated_size(ub_OriginalSize.zw, ub_Rotation); + +vec2 int_ar = vec2(fr_aspect_y / fr_aspect_x, 1.0); +vec2 rot_ar = mix(int_ar, 1.0 / int_ar.yx, is_rotated); +float int_scale_factor = max(floor(OutputRotSize.y * OriginalRotInvSize.y) + fr_i_scaling_fac-is_rotated, 1.0); +vec2 int_scale = OutputRotSize.xy * OriginalRotInvSize.y * rot_ar / int_scale_factor; + +vec2 float_scale = OutputRotSize.x * fr_zoom * allzoom / (OutputRotSize.xy * 100.0 + * rot_ar); + +vec2 fr_scale = get_rotated_size(mix(float_scale, 1.0/int_scale, fr_i_scaling), ub_Rotation); + +vec2 border_pos = vec2(border_center_x, border_center_y); + +vec2 bz_center = get_rotated_vector(vec2(bz_center_x, bz_center_y)/100.0, ub_Rotation); + + + +vec4 get_interlace_profile() +{ + vec4 int_p = vec4(SourceSize.y, SourceSize.w, CN_OFFSET, CN_SCAN_OFFSET); + + if ((InputSize.y > 288.5) && (InputSize.y < 576.5)) + { + float field_offset = mod(FrameCount, 2.0); + + int_p.xy *= vec2(0.5, 2.0); + int_p.zw += vec2(0.5)*vec2(field_offset - 0.5, field_offset); + } + + return int_p; +} + + +void main() +{ + gl_Position = MVPMatrix * VertexCoord; + + vec2 Tex = TexCoord.xy / InputToTextureSizeRatio; + + vec2 diff = Tex.xy * vec2(1.000001) - middle; + vTexCoord = middle + diff/fr_scale - fr_center; + + uv = 2.0*vTexCoord - vec2(1.0); + bezel_uv = uv - 2.0*bz_center; + + intl_profile = get_interlace_profile(); + + border_uv = get_unrotated_coords(get_unrotated_coords(Tex.xy, ub_Rotation), int(border_allow_rot)); + + border_uv.y = mix(border_uv.y, 1.0-border_uv.y, border_mirror_y); + border_uv = middle + (border_uv.xy - middle - border_pos) / (border_scale*allzoom); + border_uv = border_uv.xy * vec2(1.000001); + + mask_size = ub_OutputSize.xy * fr_scale * (1.0 - 0.5*h_curvature); +} + +#elif defined(FRAGMENT) + +#if __VERSION__ >= 130 +#define COMPAT_VARYING in +#define COMPAT_TEXTURE texture +out vec4 FragColor; +#else +#define COMPAT_VARYING varying +#define FragColor gl_FragColor +#define COMPAT_TEXTURE texture2D +#endif + +#ifdef GL_ES +#ifdef GL_FRAGMENT_PRECISION_HIGH +precision highp float; +#else +precision mediump float; +#endif +#define COMPAT_PRECISION mediump +#else +#define COMPAT_PRECISION +#endif + +uniform COMPAT_PRECISION int FrameDirection; +uniform COMPAT_PRECISION int FrameCount; +uniform COMPAT_PRECISION int Rotation; +uniform COMPAT_PRECISION vec2 OutputSize; +uniform COMPAT_PRECISION vec2 TextureSize; +uniform COMPAT_PRECISION vec2 InputSize; +uniform COMPAT_PRECISION vec2 OrigTextureSize; +uniform sampler2D Texture; +uniform sampler2D BORDER; +COMPAT_VARYING vec4 TEX0; +COMPAT_VARYING vec2 uv; +COMPAT_VARYING vec2 border_uv; +COMPAT_VARYING vec2 bezel_uv; +COMPAT_VARYING vec4 intl_profile; +COMPAT_VARYING vec2 mask_size; #ifdef PARAMETER_UNIFORM uniform COMPAT_PRECISION float all_zoom; +uniform COMPAT_PRECISION float fr_aspect_x; +uniform COMPAT_PRECISION float fr_aspect_y; uniform COMPAT_PRECISION float fr_zoom; -uniform COMPAT_PRECISION float fr_scale_x; -uniform COMPAT_PRECISION float fr_scale_y; +uniform COMPAT_PRECISION float fr_i_scaling; +uniform COMPAT_PRECISION float fr_i_scaling_fac; uniform COMPAT_PRECISION float fr_center_x; uniform COMPAT_PRECISION float fr_center_y; uniform COMPAT_PRECISION float bz_lights; uniform COMPAT_PRECISION float bz_shine_enable; +uniform COMPAT_PRECISION float bz_shine; +uniform COMPAT_PRECISION float bz_shine_size; uniform COMPAT_PRECISION float bz_ambient_enable; -uniform COMPAT_PRECISION float bz_width; -uniform COMPAT_PRECISION float bz_height; +uniform COMPAT_PRECISION float bz_blur_iter; +uniform COMPAT_PRECISION float bz_ambient; +uniform COMPAT_PRECISION float bz_ambient_size; uniform COMPAT_PRECISION float bz_ref_str; uniform COMPAT_PRECISION float bz_inner_bezel_x; uniform COMPAT_PRECISION float bz_inner_bezel_y; uniform COMPAT_PRECISION float bz_middle_bezel_x; uniform COMPAT_PRECISION float bz_middle_bezel_y; uniform COMPAT_PRECISION float bz_outer_bezel_x; uniform COMPAT_PRECISION float bz_outer_bezel_y; +uniform COMPAT_PRECISION float bz_transparent; uniform COMPAT_PRECISION float bz_outer_curve; uniform COMPAT_PRECISION float bz_radius; +uniform COMPAT_PRECISION float bz_center_x; +uniform COMPAT_PRECISION float bz_center_y; uniform COMPAT_PRECISION float bz_red; uniform COMPAT_PRECISION float bz_green; uniform COMPAT_PRECISION float bz_blue; uniform COMPAT_PRECISION float bz_ref_dist; -uniform COMPAT_PRECISION float bz_shine; -uniform COMPAT_PRECISION float bz_shine_size; -uniform COMPAT_PRECISION float bz_ambient; -uniform COMPAT_PRECISION float bz_ambient_size; uniform COMPAT_PRECISION float bz_ang; uniform COMPAT_PRECISION float bz_pos; uniform COMPAT_PRECISION float ub_border_top; uniform COMPAT_PRECISION float border_scale; uniform COMPAT_PRECISION float border_center_x; uniform COMPAT_PRECISION float border_center_y; uniform COMPAT_PRECISION float border_mirror_y; +uniform COMPAT_PRECISION float border_allow_rot; +uniform COMPAT_PRECISION float border_alpha; +uniform COMPAT_PRECISION float black_baoc; +uniform COMPAT_PRECISION float border_weight; +uniform COMPAT_PRECISION float border_dimming; uniform COMPAT_PRECISION float h_curvature; uniform COMPAT_PRECISION float h_shape; uniform COMPAT_PRECISION float h_radius; uniform COMPAT_PRECISION float h_cornersize; uniform COMPAT_PRECISION float h_cornersmooth; +uniform COMPAT_PRECISION float h_x_tilt; +uniform COMPAT_PRECISION float h_y_tilt; uniform COMPAT_PRECISION float h_angle_x; uniform COMPAT_PRECISION float h_angle_y; uniform COMPAT_PRECISION float h_overscan_x; @@ -190,16 +386,15 @@ uniform COMPAT_PRECISION float CN_InputGamma; uniform COMPAT_PRECISION float CN_OutputGamma; #else #define all_zoom 100.0 -#define fr_zoom 100.0 -#define fr_scale_x 75.0 -#define fr_scale_y 100.0 +#define fr_aspect_x 8.0 +#define fr_aspect_y 6.0 +#define fr_zoom 50.0 #define fr_center_x 0.0 #define fr_center_y 0.0 #define bz_lights 1.0 -#define bz_shine_enable 1.0 +#define bz_shine_enable 1.0 #define bz_ambient_enable 1.0 -#define bz_width 0.66 -#define bz_height 0.66 +#define bz_blur_iter 5.0 #define bz_ref_str 0.25 #define bz_inner_bezel_x 0.1 #define bz_inner_bezel_y 0.1 @@ -208,6 +403,7 @@ uniform COMPAT_PRECISION float CN_OutputGamma; #define bz_outer_bezel_x 0.3 #define bz_outer_bezel_y 0.3 #define bz_outer_curve 0.0 +#define bz_transparent 0.0 #define bz_radius 0.05 #define bz_red 128.0 #define bz_green 128.0 @@ -224,6 +420,10 @@ uniform COMPAT_PRECISION float CN_OutputGamma; #define border_center_x 0.0 #define border_center_y 0.0 #define border_mirror_y 0.0 +#define border_alpha 0.0 +#define black_baoc 0.0 +#define border_weight 0.5 +#define border_dimming 0.5 #define h_curvature 1.0 #define h_shape 0.0 #define h_radius 4.0 @@ -248,9 +448,39 @@ uniform COMPAT_PRECISION float CN_OutputGamma; #define CN_OutputGamma 2.2 #endif +// fragment compatibility #defines +#define Source Texture +#define vTexCoord TEX0.xy +#define SourceSize vec4(TextureSize, 1.0 / TextureSize) //either TextureSize or InputSize +//#define SourceSize vec4(InputSize, 1.0 / TextureSize) //It works this way only! +#define OutSize vec4(OutputSize, 1.0 / OutputSize) +#define OrigTexSize vec4(OrigTextureSize, 1.0 / OrigTextureSize) + +#define ub_OutputSize OutSize +#define ub_OriginalSize OrigTexSize +#define ub_Rotation Rotation + + +#define InputToTextureSizeRatio (InputSize.xy / TextureSize.xy) + +vec2 get_rotated_size(vec2 x, int rotation) { + if (rotation == 0 || rotation == 2) return x; + else return x.yx; +} + + +vec2 get_rotated_vector(vec2 x, int rotation) { + if (rotation == 0) return x; + else if (rotation == 1) return vec2(-x.y, x.x); + else if (rotation == 2) return -x; + else return vec2(x.y, -x.x); +} + + #define GAMMA_IN(color) CN_BRIGHTBOOST*pow(color, vec3(CN_InputGamma)) #define GAMMA_OUT(color) pow(color, vec3(1.0 / CN_OutputGamma)) + #define PIX_SIZE 1.111111 #define CN_OFFSET 0.5 #define CN_SCAN_OFFSET 0.0 @@ -260,135 +490,53 @@ uniform COMPAT_PRECISION float CN_OutputGamma; #define PI 3.141592653589 -#define R_BLUR_ITER 5 +//#define R_BLUR_ITER 5 #define R_BLUR_SIZE 0.02 -#define border_pos vec2(border_center_x,border_center_y) - const float on = 1.; const float off = 0.; const vec2 middle = vec2(0.5); -const vec2 shine_position = vec2(0.0, 1.0); -const float SMTH = 0.004; -const vec2 bz_shadow = vec2(0.0, -0.06); -float pix_sizex = mix(PIX_SIZE, CN_SCAN_SIZE, CN_VSCANLINES); -float scan_sizey = mix(CN_SCAN_SIZE, PIX_SIZE, CN_VSCANLINES); +vec2 OutputRotSize = get_rotated_size( ub_OutputSize.xy, ub_Rotation); +vec2 OriginalRotInvSize = get_rotated_size(ub_OriginalSize.zw, ub_Rotation); -float shine_size = (1.0 - bz_shine_size ); -float amb_size = (1.0 - bz_ambient_size); - -vec2 fr_center = vec2(fr_center_x, fr_center_y)/100.0; -vec2 fr_scale = vec2(fr_scale_x, fr_scale_y)*fr_zoom*(all_zoom/100.0)/10000.0; - -vec2 overscan = vec2(h_overscan_x, h_overscan_y)/100.0; -vec2 SIZE = vec2(bz_width, bz_height); -vec2 size_over = overscan * SIZE; +vec2 overscan = 100.0/(get_rotated_size(vec2(h_overscan_x, h_overscan_y), ub_Rotation)); +vec2 content_position = 2.0*get_rotated_vector(vec2(h_angle_x, h_angle_y), ub_Rotation); float r2 = h_radius * h_radius; vec2 max_size = vec2(sqrt( (r2 - 2.0) / (r2 - 1.0) ), 1.0); -vec2 aspect = vec2(1.0, OutSize.y/OutSize.x); -vec2 aspect_adj = vec2(aspect.x, aspect.y*fr_scale_y/fr_scale_x); +vec2 aspect = vec2(1.0, OutputRotSize.y/OutputRotSize.x); float cornersize = h_cornersize * min(aspect.x, aspect.y); float cornersmooth = h_cornersmooth/100.0; +vec2 tilt = h_radius*sin(get_rotated_vector(vec2(h_x_tilt, h_y_tilt), ub_Rotation)); -vec3 BZ_COLOR = vec3(bz_red, bz_green, bz_blue)/255.0; - -vec2 INN_BZ = vec2(bz_inner_bezel_x, bz_inner_bezel_y) + vec2(bz_width, bz_height); -vec2 MID_BZ = vec2(bz_middle_bezel_x, bz_middle_bezel_y) + INN_BZ; -vec2 OUT_BZ = vec2(bz_outer_bezel_x, bz_outer_bezel_y) + MID_BZ; -float cyl_shape = (1.0-bz_outer_curve)*h_shape*h_curvature; - -float mb_aspect = bz_middle_bezel_y/bz_middle_bezel_x; - -vec2 mask_size = OutSize.xy* fr_scale * (1.0 - 0.5*h_curvature); - -vec2 InputToTextureSizeRatio = InputSize.xy / TextureSize.xy; - -#if defined(VERTEX) - -uniform mat4 MVPMatrix; - -COMPAT_ATTRIBUTE vec4 VertexCoord; -COMPAT_ATTRIBUTE vec4 TexCoord; -COMPAT_VARYING vec4 TEX0; -COMPAT_VARYING vec2 uv; -COMPAT_VARYING vec2 border_uv; -COMPAT_VARYING vec4 intl_profile; - - -vec4 get_interlace_profile() -{ - vec4 int_p = vec4(SourceSize.y, SourceSize.w, CN_OFFSET, CN_SCAN_OFFSET); - - if ((SourceSize.y > 288.5) && (SourceSize.y < 576.5)) - { - float field_offset = mod(float(FrameCount), 2.0); - - int_p.xy *= vec2(0.5, 2.0); - int_p.zw += 0.5*vec2(field_offset - 0.5, field_offset); - } +float shine_size = (1.0 - bz_shine_size ); +float amb_size = (1.0 - bz_ambient_size); - return int_p; -} +vec2 shine_position = get_rotated_vector(vec2(0.0, 1.0), ub_Rotation); +const float SMTH = 0.004; +vec2 bz_shadow = get_rotated_vector(vec2(0.0, -0.06), ub_Rotation); -void main() -{ - gl_Position = MVPMatrix * VertexCoord; - vec2 Tex = TexCoord.xy / InputToTextureSizeRatio; +vec3 BZ_COLOR = vec3(bz_red, bz_green, bz_blue)/255.0; - vec2 diff = Tex.xy * vec2(1.000001) - middle; - vTexCoord = middle + diff/fr_scale - fr_center; +vec2 INN_BZ = get_rotated_size(vec2(bz_inner_bezel_x, bz_inner_bezel_y), ub_Rotation) + vec2(1.0); +vec2 MID_BZ = get_rotated_size(vec2(bz_middle_bezel_x, bz_middle_bezel_y), ub_Rotation) + INN_BZ; +vec2 OUT_BZ = get_rotated_size(vec2(bz_outer_bezel_x, bz_outer_bezel_y), ub_Rotation) + MID_BZ; - uv = 2.0*vTexCoord - vec2(1.0); +float cyl_shape = (1.0-bz_outer_curve)*h_shape*h_curvature; - intl_profile = get_interlace_profile(); +float mb_aspect = (MID_BZ.y-INN_BZ.y)/(MID_BZ.x-INN_BZ.x); - border_uv = mix( Tex.xy, vec2( Tex.y, 1.0 - Tex.x), float(Rotation==1)); - border_uv = mix(border_uv.xy, vec2(1.0-border_uv.x, 1.0-border_uv.y), float(Rotation==2)); // It seems useless... - border_uv = mix(border_uv.xy, vec2(1.0-border_uv.y, border_uv.x), float(Rotation==3)); +float pix_sizex = mix(PIX_SIZE, CN_SCAN_SIZE, CN_VSCANLINES); +float scan_sizey = mix(CN_SCAN_SIZE, PIX_SIZE, CN_VSCANLINES); - border_uv.y = mix(border_uv.y, 1.0-border_uv.y, border_mirror_y); - border_uv = middle + (border_uv.xy - middle - border_pos) / (border_scale*all_zoom/100.0); - border_uv = border_uv.xy * vec2(1.000001); +float rand(vec2 co){ + return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); } -#elif defined(FRAGMENT) - -#if __VERSION__ >= 130 -#define COMPAT_VARYING in -#define COMPAT_TEXTURE texture -out vec4 FragColor; -#else -#define COMPAT_VARYING varying -#define FragColor gl_FragColor -#define COMPAT_TEXTURE texture2D -#endif - -#ifdef GL_ES -#ifdef GL_FRAGMENT_PRECISION_HIGH -precision highp float; -#else -precision mediump float; -#endif -#define COMPAT_PRECISION mediump -#else -#define COMPAT_PRECISION -#endif - - -uniform sampler2D Texture; -uniform sampler2D BORDER; -COMPAT_VARYING vec4 TEX0; -COMPAT_VARYING vec2 uv; -COMPAT_VARYING vec2 border_uv; -COMPAT_VARYING vec4 intl_profile; - -// fragment compatibility #defines -#define Source Texture /* Mask code pasted from subpixel_masks.h. Masks 3 and 4 added. */ vec3 mask_weights(vec2 coord, float phosphor_layout){ @@ -601,8 +749,6 @@ vec3 mask_weights(vec2 coord, float phosphor_layout){ else return weights; } - - vec2 wgt(vec2 size) { size = clamp(size, -1.0, 1.0); @@ -617,11 +763,6 @@ float vignette(vec2 uv) return clamp( pow( CN_VIG_BASE * vignette, CN_VIG_EXP ), 0.0, 1.0 ); } -float rand(vec2 co){ - return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); -} - - // Fast when two first are constants. float fsmoothstep(float a, float b, float x) { return clamp(x*(1.0/(b - a)) - (a/(b - a)), 0.0, 1.0); @@ -633,18 +774,21 @@ vec2 fsmoothstep(vec2 a, vec2 b, vec2 x) { float h_corner(vec2 uv) { - vec2 d = abs((2.0*uv - vec2(1.0)) * aspect_adj*SIZE) - (aspect_adj*SIZE - vec2(cornersize)); + vec2 d = abs((2.0*uv - vec2(1.0)) * aspect) - (aspect - vec2(cornersize)); float borderline = length(max(d, vec2(0.0))) + min(max(d.x, d.y), 0.0) - cornersize; return fsmoothstep(cornersmooth, -cornersmooth, borderline); } + vec2 h_warp(vec2 uv) { - vec2 cylinder = sqrt( (r2 - uv.x*uv.x) / (r2 - 2.0*uv.x*uv.x) )*max_size; - vec2 sphere = vec2(sqrt( (r2 - 1.0 ) / (r2 - dot(uv, uv)) )); + vec2 uvt = uv + tilt; - uv *= mix(sphere, cylinder, h_shape); + vec2 cylinder = sqrt( (r2 - uvt.x*uvt.x) / (r2 - 2.0*uvt.x*uvt.x) )*max_size; + float sphere = sqrt( (r2 - 1.0) / ( r2 - dot(uvt, uvt) ) ); + + uv *= mix(vec2(sphere), cylinder, h_shape); return uv; } @@ -687,38 +831,8 @@ vec2 ReflectionCoords(vec2 uv, float r) return 0.5*ref_coord + vec2(0.5); } - - -void main() +vec3 get_content(vec2 vTex, vec2 uv) { - -// Bezels and border begins... - - vec2 uvFC = mix(uv, h_warp(uv), h_curvature); // Frame content area - vec2 uvIB = uvFC; // Inner bezel area - vec2 uvMB = mix(uv, uvFC, bz_outer_curve); // In Between bezel area - vec2 uvOB = uvMB; // Outer bezel area - - uvFC = uvFC/size_over - 2.0*vec2(h_angle_x, h_angle_y); - - vec2 area_out = RoundedRectVec(vec4(uvMB, uvOB), vec4(MID_BZ, OUT_BZ), vec2(bz_radius), vec2(SMTH, -SMTH)); - - vec4 border = COMPAT_TEXTURE(BORDER, border_uv); - - border.rgb *= (bz_lights > 0.5) ? 1.0 : 0.5; - if (area_out.y < 0.5) {FragColor = vec4(border.rgb, 1.0); return;} - -// Bezels pause... - -// Content frame begins... (put content shader code here) -// crt-nobody - - vec2 vTex = 0.5*uvFC + vec2(0.5); - - float cval = h_corner(vTex) * step(0.0, fract(vTex.y)); // Discard off limit pixels - - float vig = (CN_VIG_TOGGLE > 0.5) ? vignette(vTex) : 1.0; - vec4 TexSize = vec4(SourceSize.x, intl_profile.x, SourceSize.z, intl_profile.y); vec2 cn_offset = vec2(CN_OFFSET , intl_profile.z); vec2 scan_off = vec2(CN_SCAN_OFFSET, intl_profile.w); @@ -732,48 +846,83 @@ void main() vec2 g1 = dir * vec2(TexSize.z, 0); vec2 g2 = dir * vec2( 0, TexSize.w); - mat2x3 AB = mat2x3(clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc ).xyz), 0.0, 1.0), clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g1 ).xyz), 0.0, 1.0)); - mat2x3 CD = mat2x3(clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g2).xyz), 0.0, 1.0), clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g1+g2).xyz), 0.0, 1.0)); + vec3 A = clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc ).xyz), 0.0, 1.0); + vec3 B = clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g1 ).xyz), 0.0, 1.0); + vec3 C = clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g2 ).xyz), 0.0, 1.0); + vec3 D = clamp(GAMMA_IN(COMPAT_TEXTURE(Source, tc +g1+g2).xyz), 0.0, 1.0); vec2 wx = wgt(vec2(pos.x, 1.0-pos.x) / pix_sizex); - mat2x3 cc = mat2x3(AB * wx, CD * wx); + vec3 cc0 = (A*wx.x + B*wx.y); + vec3 cc1 = (C*wx.x + D*wx.y); - float c0max = max(cc[0].r, max(cc[0].g, cc[0].b)); - float c1max = max(cc[1].r, max(cc[1].g, cc[1].b)); + float c0max = max(cc0.r, max(cc0.g, cc0.b)); + float c1max = max(cc1.r, max(cc1.g, cc1.b)); float lum0 = mix(CN_BEAM_MIN_WIDTH, CN_BEAM_MAX_WIDTH, c0max); float lum1 = mix(CN_BEAM_MIN_WIDTH, CN_BEAM_MAX_WIDTH, c1max); - vec2 ssy = vec2(scan_sizey); + vec2 ssy = vec2(scan_sizey); ssy.x *= (CN_VSCANLINES > 0.5 ? 1.0 : lum0); ssy.y *= (CN_VSCANLINES > 0.5 ? 1.0 : lum1); - vec3 content = vig * (cc * wgt(vec2(pos.y, 1.0-pos.y) / ssy)); + float vig = (CN_VIG_TOGGLE > 0.5) ? vignette(vTex) : 1.0; + + vec2 wy = wgt(vec2(pos.y, 1.0-pos.y) / ssy); + + vec3 content = vig * (cc0 * wy.x + cc1 * wy.y); // Mask - vec2 mask_coords = mix(vTexCoord, uv, h_curvature) * mask_size; +// vec2 mask_coords = mix(vTexCoord, uv, global.h_curvature) * mask_size; + vec2 mask_coords = mix(vTex, uv, h_curvature) * mask_size; mask_coords = mix(mask_coords.xy, mask_coords.yx, CN_VSCANLINES); vec3 mask_wgts = mask_weights(mask_coords, CN_PHOSPHOR_LAYOUT); mask_wgts = clamp(mask_wgts + vec3(1.0-CN_MASK_STRENGTH), 0.0, 1.0); mask_wgts = (CN_MONITOR_SUBPIXELS > 0.5) ? mask_wgts.bgr : mask_wgts; - content = GAMMA_OUT(content) * GAMMA_OUT(mask_wgts) * vec3(cval); + return GAMMA_OUT(content) * GAMMA_OUT(mask_wgts); +} + +void main() +{ + +// Bezels and border begins... + + vec2 uvFC = mix(uv, h_warp(uv), h_curvature); // Frame content area + vec2 uvIB = uvFC; // Inner bezel area + vec2 uvMB = mix(bezel_uv, h_warp(bezel_uv), bz_outer_curve); // In Between bezel area + vec2 uvOB = bezel_uv; // Outer bezel area + + uvFC = uvFC*overscan - content_position; + + vec2 area_out = RoundedRectVec(vec4(uvMB, uvOB), vec4(MID_BZ, OUT_BZ), vec2(bz_radius), vec2(SMTH, -SMTH)); + + vec4 border = COMPAT_TEXTURE(BORDER, border_uv); + + if (bz_lights < 0.5){ +\tborder.rgb *= border_dimming; + } + + if (area_out.y < 1.0) {FragColor = vec4(border.rgb, 1.0); return;} + +// Bezels pause... + +// Content frame begins... (put content shader code here) + vec2 fcTex = (0.5*uvFC + vec2(0.5)) * InputToTextureSizeRatio; -// content = GAMMA_OUT(content) * vec3(cval); + float cval = h_corner(fcTex) * step(0.0, fract(fcTex.y)); // Discard off limit pixels -// Content frame ends. +// Call to content shader here. + vec3 content = get_content(fcTex, uv) * vec3(cval); // Bezels continue... vec2 area_inn = RoundedRectVec(vec4(uvIB, uvMB), vec4(INN_BZ, MID_BZ), vec2(bz_radius), vec2(SMTH, -SMTH)); - float out_border = RoundedRect(uvOB, OUT_BZ, bz_radius, vec2(SMTH)); - - vec3 frame_content = mix(content+border.rgb*out_border, mix(content.rgb, border.rgb, border.a), ub_border_top); + content = mix(content, mix(content.rgb, border.rgb, border.a), ub_border_top); float ambient = bz_ambient; float ambient_out = 1.4*bz_ambient; @@ -792,9 +941,18 @@ void main() \tambient_content += max(0.0, ambient - amb_size*length(uvIB)) * RoundedRect(uvIB, INN_BZ, bz_radius, -vec2(SMTH)); } - frame_content += (bz_ambient_enable*ambient_content + bz_shine_enable*shine_content); + vec3 frame_content = content + (bz_ambient_enable*ambient_content + bz_shine_enable*shine_content); - if (area_inn.x < 0.5) { FragColor = vec4(frame_content, 1.0); return;} + if (area_inn.x < 0.5) + { + vec3 content_emphasis = clamp(border.rgb*border.a * border_alpha + frame_content, 0.0, 1.0); + + vec3 baoc = mix(frame_content, border.rgb, border_alpha); + + FragColor = vec4(mix(baoc, content_emphasis, black_baoc), 1.0); + + return; + } float bezel_inner_area = area_inn.x * area_inn.y; float bezel_outer_area = area_out.x * area_out.y; @@ -803,33 +961,37 @@ void main() // Inner Bezel Reflection Coords vec2 uvR = ReflectionCoords(uvFC, bz_ref_dist) * InputToTextureSizeRatio; - vec2 r_blur_size = vec2(R_BLUR_SIZE) * InputToTextureSizeRatio; vec3 Blur = vec3(0.0); - float fsm = 1.0 - fsmoothstep(0.8, 1.0, abs(uvFC.x))*fsmoothstep(0.8, 1.0, abs(uvFC.y)); - for(int i = 0; i < R_BLUR_ITER; i++) - Blur += COMPAT_TEXTURE(Source, uvR + (vec2(rand(uvR+float(i)),rand(uvR+float(i)+0.00625))-vec2(0.5))*r_blur_size).rgb; + for(int i = 0; i < clamp(bz_blur_iter, 5.0, 32.0); i++) // clamp needed to fix D3D compatibility + Blur += COMPAT_TEXTURE(Source, uvR + (vec2(rand(uvR+float(i)),rand(uvR+float(i)+0.00625))-vec2(0.5))*R_BLUR_SIZE).rgb; - Blur *= (fsm * bz_ref_str / float(R_BLUR_ITER)); + Blur /= bz_blur_iter; + + // Blur in cheap linear gamma (2.0) + Blur = sqrt(Blur); + + Blur *= ((1.0 - fsmoothstep(0.8, 1.0, abs(uvFC.x))*fsmoothstep(0.8, 1.0, abs(uvFC.y))) * bz_ref_str ); // This is a hack. Still needs analytical solution. vec2 IB = abs(uvIB); IB = vec2(IB.x*mb_aspect, IB.y - MID_BZ.y + mb_aspect*MID_BZ.x); float corner = fsmoothstep(-bz_radius, bz_radius, IB.y - mix(IB.x, bz_ang*IB.x + bz_pos, cyl_shape)); + if (bz_transparent > 0.5) BZ_COLOR = border.rgb; + if (bz_lights == 1.0) { - -\t// Bezel texture - \tvec3 bz_color = clamp(BZ_COLOR + rand(uvIB)*0.0125-0.00625, 0.0, 1.0) + + // Bezel texture + vec3 bz_color = clamp(BZ_COLOR + rand(uvIB)*0.0125-0.00625, 0.0, 1.0) + rand(uvIB+vec2(1.0))*0.0625 * cos(0.75*PI*uvIB.x); - // Inner Bezel and Reflections - bezels += bz_color * bezel_inner_area * (Blur + 0.25*(1.0 + corner)); + bezels += (bz_color + Blur) * bezel_inner_area * (0.25*(1.0 + corner)); \t// Outer Bezel - \tbezels += bz_color * bezel_outer_area; + \tbezels += mix(bz_color, BZ_COLOR, bz_transparent) * bezel_outer_area; + } else { @@ -838,14 +1000,17 @@ void main() RoundedRect(uvOB, MID_BZ, bz_radius, vec2(SMTH*2.0, -SMTH* 2.0)); // Inner Bezel and Reflections - bezels += BZ_COLOR * bezel_inner_area * (ambient_out * (0.7 + 0.35*(1.0 - corner)) + Blur); + bezels += (BZ_COLOR + Blur) * bezel_inner_area * (ambient_out * (0.7 + 0.35*(1.0 - corner)) + Blur); // Outer Bezel - bezels += BZ_COLOR * bezel_outer_area * ambient_out; + bezels += BZ_COLOR * bezel_outer_area * mix(ambient_out, 1.0, bz_transparent); + } - bezels = mix(bezels+border.rgb*out_border, mix(bezels, border.rgb, border.a), ub_border_top); + bezels = mix(bezels+border.rgb*bezel_inner_area*bz_transparent, mix(bezels, border.rgb, border.a), ub_border_top); FragColor = vec4(bezels, 1.0); } #endif

Qt: Allow recording on game boot

35ef4af

github-actions bot added the GUI/Qt label Feb 26, 2025

F0bes merged commit fa23628 into master Feb 26, 2025
22 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Qt: Allow recording on game boot #12363

Qt: Allow recording on game boot #12363

F0bes commented Feb 26, 2025

Qt: Allow recording on game boot #12363

Qt: Allow recording on game boot #12363

Conversation

F0bes commented Feb 26, 2025