Skip to content
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.

Sign up for GitHub

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

[DrLuigi] Fix undefined shader behavior, merge AA mod into graphics mod #664

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[DrLuigi] Fix undefined shader behavior, merge AA mod into graphics mod #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6abbfc6
Delete Enhancements/DrLuigi_!AntiAliasing directory
intra0 Dec 14, 2024
3404304
Delete Resolutions/DrLuigi_Resolution directory
intra0 Dec 14, 2024
b59c480
Upload src/DrLuigi
intra0 Dec 14, 2024
fa3418a
Delete src/DrLuigi/Enhancements/AntiAliasing directory
intra0 Dec 14, 2024
02b4037
Figured out how to merge the 2 mods
intra0 Dec 14, 2024
72bacdb
Delete src/DrLuigi/Graphics directory
intra0 Dec 14, 2024
462c140
oops
intra0 Dec 14, 2024
5da94d1
add :int to $AAEnable
intra0 Dec 14, 2024
7f11765
glsl to v430
intra0 Dec 17, 2024
6fe6108
trailing white space in preprocessor statement
intra0 Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Enhancements/DrLuigi_!AntiAliasing/rules.txt
View file
Open in desktop

This file was deleted.

246 changes: 0 additions & 246 deletions Resolutions/DrLuigi_Resolution/9e9abde99f9510dc_000000000000001c_ps.txt
View file
Open in desktop

This file was deleted.

30 changes: 23 additions & 7 deletions .../9e9abde99f9510dc_000000000000001c_ps.txt → .../9e9abde99f9510dc_000000000000001c_ps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#version 420
#version 430
#extension GL_ARB_texture_gather : enable
#extension GL_ARB_separate_shader_objects : enable
#ifdef VULKAN
Expand Down Expand Up @@ -29,6 +29,10 @@ uniform vec4 uf_fragCoordScale;
uniform float uf_alphaTestRef;
uniform vec2 uf_fragCoordScale;
#endif

#define AAENABLE $AAEnable


TEXTURE_LAYOUT(0, 1, 0) uniform sampler2D textureUnitPS0;
layout(location = 0) in vec4 passParameterSem129;
layout(location = 1) in vec4 passParameterSem128;
Expand Down Expand Up @@ -68,22 +72,34 @@ ivec4 ARi = ivec4(0);
bool predResult = true;
vec3 cubeMapSTM;
int cubeMapFaceId;
R0i = floatBitsToInt(passParameterSem129);
#if (AAENABLE == 1)
R0i = floatBitsToInt(passParameterSem129);
#endif
R1i = floatBitsToInt(passParameterSem128);
R5i.xyz = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R1i.zw)).xyz);
R6i.xyz = floatBitsToInt(texture(textureUnitPS0, intBitsToFloat(R1i.xy)).xyz);

ivec2 resolution = textureSize(textureUnitPS0,0);
float iresX = float(resolution.x)/float(1280);
float iresY = float(resolution.y)/float(720);
#if (AAENABLE == 1)
ivec2 resolution = textureSize(textureUnitPS0,0);
float iresX = float(resolution.x)/float(1280);
float iresY = float(resolution.y)/float(720);
#endif

// 0
backupReg0i = R0i.y;
backupReg1i = R0i.x;
PV0i.x = 0;
PV0i.y = floatBitsToInt(intBitsToFloat(backupReg0i) / iresY);
#if (AAENABLE == 1)
PV0i.y = floatBitsToInt(intBitsToFloat(backupReg0i) / iresY);
#else
PV0i.y = floatBitsToInt(intBitsToFloat(backupReg0i) * 1.0);
#endif
PV0i.z = 0;
R127i.w = floatBitsToInt(intBitsToFloat(backupReg1i) / iresX);
#if (AAENABLE == 1)
R127i.w = floatBitsToInt(intBitsToFloat(backupReg1i) / iresX);
#else
R127i.w = floatBitsToInt(intBitsToFloat(backupReg1i) * 1.0);
#endif
PV0i.w = R127i.w;
R8i.w = 0x3f800000;
PS0i = R8i.w;
Expand Down
Loading