-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rsx: Improved 24-bit format handling and shader refactoring #15065
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ac474b9
rsx: More pipeine refactoring
kd-11 c1502d2
rsx: Forcefully disable writes to channels disabled on host
kd-11 d62b273
rsx: Aesthetic changes
kd-11 7597929
rsx: Fix compiling of mixed-precision shaders
kd-11 b798bad
rsx: Do not emit rounding code when not needed
kd-11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 21 additions & 4 deletions
25
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| R"( | ||
|
|
||
| /** | ||
| * Required register definitions from ROP config | ||
| struct { | ||
| vec4 blend_constants; // fp32x4 | ||
| uint blend_func; // rgb16, a16 | ||
| uint blend_factors_a; // src16, dst16 | ||
| uint blend_factors_rgb; // src16, dst16 | ||
| } | ||
| */ | ||
|
|
||
| #define BLEND_FACTOR_ZERO 0 | ||
| #define BLEND_FACTOR_ONE 1 | ||
| #define BLEND_FACTOR_SRC_COLOR 0x0300 | ||
| #define BLEND_FACTOR_ONE_MINUS_SRC_COLOR 0x0301 | ||
| #define BLEND_FACTOR_SRC_ALPHA 0x0302 | ||
| #define BLEND_FACTOR_ONE_MINUS_SRC_ALPHA 0x0303 | ||
| #define BLEND_FACTOR_DST_ALPHA 0x0304 | ||
| #define BLEND_FACTOR_ONE_MINUS_DST_ALPHA 0x0305 | ||
| #define BLEND_FACTOR_DST_COLOR 0x0306 | ||
| #define BLEND_FACTOR_ONE_MINUS_DST_COLOR 0x0307 | ||
| #define BLEND_FACTOR_SRC_ALPHA_SATURATE 0x0308 | ||
| #define BLEND_FACTOR_CONSTANT_COLOR 0x8001 | ||
| #define BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR 0x8002 | ||
| #define BLEND_FACTOR_CONSTANT_ALPHA 0x8003 | ||
| #define BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA 0x8004 | ||
|
|
||
| #define BLEND_FUNC_ADD 0x8006 | ||
| #define BLEND_MIN 0x8007 | ||
| #define BLEND_MAX 0x8008 | ||
| #define BLEND_FUNC_SUBTRACT 0x800A | ||
| #define BLEND_FUNC_REVERSE_SUBTRACT 0x800B | ||
| #define BLEND_FUNC_REVERSE_SUBTRACT_SIGNED 0x0000F005 | ||
| #define BLEND_FUNC_ADD_SIGNED 0x0000F006 | ||
| #define BLEND_FUNC_REVERSE_ADD_SIGNED 0x0000F007 | ||
|
|
||
| float get_blend_factor_a(const in uint op, const in vec4 src, const in vec4 dst) | ||
| { | ||
| switch (op) | ||
| { | ||
| case BLEND_FACTOR_ZERO: return 0.; | ||
| case BLEND_FACTOR_ONE: return 1.; | ||
| case BLEND_FACTOR_SRC_COLOR: | ||
| case BLEND_FACTOR_SRC_ALPHA: return src.a; | ||
| case BLEND_FACTOR_ONE_MINUS_SRC_COLOR: | ||
| case BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return 1. - src.a; | ||
| case BLEND_FACTOR_DST_ALPHA: | ||
| case BLEND_FACTOR_DST_COLOR: return dst.a; | ||
| case BLEND_FACTOR_ONE_MINUS_DST_ALPHA: | ||
| case BLEND_FACTOR_ONE_MINUS_DST_COLOR: return 1. - dst.a; | ||
| case BLEND_FACTOR_SRC_ALPHA_SATURATE: return 1; | ||
| case BLEND_FACTOR_CONSTANT_COLOR: | ||
| case BLEND_FACTOR_CONSTANT_ALPHA: return constants.a; | ||
| case BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: | ||
| case BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: return 1. - constants.a; | ||
| } | ||
| return 0.; | ||
| } | ||
|
|
||
| vec3 get_blend_factor_rgb(const in uint op, const in vec4 src, const in vec4 dst) | ||
| { | ||
| switch (op) | ||
| { | ||
| case BLEND_FACTOR_ZERO: return vec3(0.); | ||
| case BLEND_FACTOR_ONE: return vec3(1.); | ||
| case BLEND_FACTOR_SRC_COLOR: return src.rgb; | ||
| case BLEND_FACTOR_SRC_ALPHA: return src.aaa; | ||
| case BLEND_FACTOR_ONE_MINUS_SRC_COLOR: return 1. - src.rgb; | ||
| case BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return 1. - src.aaa; | ||
| case BLEND_FACTOR_DST_COLOR: return dst.rgb; | ||
| case BLEND_FACTOR_DST_ALPHA: return dst.a; | ||
| case BLEND_FACTOR_ONE_MINUS_DST_COLOR: return 1. - dst.rgb; | ||
| case BLEND_FACTOR_ONE_MINUS_DST_ALPHA: return 1. - dst.a; | ||
| case BLEND_FACTOR_SRC_ALPHA_SATURATE: return src.rgb; | ||
| case BLEND_FACTOR_CONSTANT_COLOR: return blend_constants.rgb; | ||
| case BLEND_FACTOR_CONSTANT_ALPHA: return blend_constants.aaa; | ||
| case BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: return 1. - blend_constants.rgb; | ||
| case BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: return 1. - blend_constants.aaa; | ||
| } | ||
| return vec3(0.); | ||
| } | ||
|
|
||
| float apply_blend_func_a(const in vec4 src, const in vec4 dst) | ||
| { | ||
| uint blend_factor_a_s = _get_bits(blend_factors_a, 0, 16); | ||
| uint blend_factor_a_d = _get_bits(blend_factors_a, 16, 16); | ||
| uint func = _get_bits(blend_func, 16, 16); | ||
|
|
||
| const float src_factor_a = get_blend_factor_a(blend_factor_a_s, src, dst); | ||
| const float dst_factor_a = get_blend_factor_a(blend_factor_a_d, src, dst); | ||
|
|
||
| // NOTE: Destination data is already saturated due to encoding. | ||
| const float s = src.a * src_factor_a; | ||
| const float d = dst.a * dst_factor_a; | ||
|
|
||
| switch (func) | ||
| { | ||
| case BLEND_FUNC_ADD: return _saturate(s) + d; | ||
| case BLEND_MIN: return min(_saturate(s), d); | ||
| case BLEND_MAX: return max(_saturate(s), d); | ||
| case BLEND_FUNC_SUBTRACT: return _saturate(s) - d; | ||
| case BLEND_FUNC_REVERSE_SUBTRACT: return d - _saturate(s); | ||
| case BLEND_FUNC_REVERSE_SUBTRACT_SIGNED: return d - s; | ||
| case BLEND_FUNC_ADD_SIGNED: return s + d; | ||
| case BLEND_FUNC_REVERSE_ADD_SIGNED: return s + d; | ||
| } | ||
|
|
||
| return vec3(0.); | ||
| } | ||
|
|
||
| vec3 apply_blend_func_rgb(const in vec4 src, const in vec4 dst) | ||
| { | ||
| uint blend_factor_rgb_s = _get_bits(blend_factors_rgb, 0, 16); | ||
| uint blend_factor_rgb_d = _get_bits(blend_factors_rgb, 16, 16); | ||
| uint func = _get_bits(blend_func, 0, 16); | ||
|
|
||
| const vec3 src_factor_rgb = get_blend_factor_rgb(blend_factor_rgb_s, src, dst); | ||
| const vec3 dst_factor_rgb = get_blend_factor_rgb(blend_factor_rgb_d, src, dst); | ||
|
|
||
| // NOTE: Destination data is already saturated due to encoding. | ||
| const vec3 s = src.rgb * src_factor_rgb; | ||
| const vec3 d = dst.rgb * dst_factor_rgb; | ||
|
|
||
| switch (func) | ||
| { | ||
| case BLEND_FUNC_ADD: return _saturate(s) + d; | ||
| case BLEND_MIN: return min(_saturate(s), d); | ||
| case BLEND_MAX: return max(_saturate(s), d); | ||
| case BLEND_FUNC_SUBTRACT: return _saturate(s) - d; | ||
| case BLEND_FUNC_REVERSE_SUBTRACT: return d - _saturate(s); | ||
| case BLEND_FUNC_REVERSE_SUBTRACT_SIGNED: return d - s; | ||
| case BLEND_FUNC_ADD_SIGNED: return s + d; | ||
| case BLEND_FUNC_REVERSE_ADD_SIGNED: return s + d; | ||
| } | ||
|
|
||
| return vec3(0.); | ||
| } | ||
|
|
||
| vec4 do_blend(const in vec4 src, const in vec4 dst) | ||
| { | ||
| // Read blend_constants from config and apply blend op | ||
| const vec4 result = vec4( | ||
| apply_blend_func_rgb(src, dst), | ||
| apply_blend_func_a(src, dst) | ||
| ); | ||
|
|
||
| // Accurate int conversion with wrapping | ||
| return round_to_8bit(result); | ||
| } | ||
|
|
||
| )" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.