emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR 7384

Browse Source
This commit is contained in:
citrabot 2024-03-04 00:25:34 +00:00
parent ab626208c5
commit 0ebc2068a0
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/video_core/host_shaders/vulkan_present.frag
View File

@ -20,6 +20,18 @@ layout (push_constant, std140) uniform DrawInfo {
layout (set = 0, binding = 0) uniform sampler2D screen_textures[3]; layout (set = 0, binding = 0) uniform sampler2D screen_textures[3];
void main() { // Not all vulkan drivers support shaderSampledImageArrayDynamicIndexing, so index manually.
color = texture(screen_textures[screen_id_l], frag_tex_coord); vec4 GetScreen(int screen_id) {
switch (screen_id) {
case 0:
return texture(screen_textures[0], frag_tex_coord);
case 1:
return texture(screen_textures[1], frag_tex_coord);
case 2:
return texture(screen_textures[2], frag_tex_coord);
}
}
void main() {
color = GetScreen(screen_id_l);
} }

16
src/video_core/host_shaders/vulkan_present_anaglyph.frag
View File

@ -32,8 +32,20 @@ layout (push_constant, std140) uniform DrawInfo {
layout (set = 0, binding = 0) uniform sampler2D screen_textures[3]; layout (set = 0, binding = 0) uniform sampler2D screen_textures[3];
// Not all vulkan drivers support shaderSampledImageArrayDynamicIndexing, so index manually.
vec4 GetScreen(int screen_id) {
switch (screen_id) {
case 0:
return texture(screen_textures[0], frag_tex_coord);
case 1:
return texture(screen_textures[1], frag_tex_coord);
case 2:
return texture(screen_textures[2], frag_tex_coord);
}
}
void main() { void main() {
vec4 color_tex_l = texture(screen_textures[screen_id_l], frag_tex_coord); vec4 color_tex_l = GetScreen(screen_id_l);
vec4 color_tex_r = texture(screen_textures[screen_id_r], frag_tex_coord); vec4 color_tex_r = GetScreen(screen_id_r);
color = vec4(color_tex_l.rgb*l+color_tex_r.rgb*r, color_tex_l.a); color = vec4(color_tex_l.rgb*l+color_tex_r.rgb*r, color_tex_l.a);
} }

16
src/video_core/host_shaders/vulkan_present_interlaced.frag
View File

@ -20,10 +20,22 @@ layout (push_constant, std140) uniform DrawInfo {
layout (set = 0, binding = 0) uniform sampler2D screen_textures[3]; layout (set = 0, binding = 0) uniform sampler2D screen_textures[3];
// Not all vulkan drivers support shaderSampledImageArrayDynamicIndexing, so index manually.
vec4 GetScreen(int screen_id) {
switch (screen_id) {
case 0:
return texture(screen_textures[0], frag_tex_coord);
case 1:
return texture(screen_textures[1], frag_tex_coord);
case 2:
return texture(screen_textures[2], frag_tex_coord);
}
}
void main() { void main() {
float screen_row = o_resolution.x * frag_tex_coord.x; float screen_row = o_resolution.x * frag_tex_coord.x;
if (int(screen_row) % 2 == reverse_interlaced) if (int(screen_row) % 2 == reverse_interlaced)
color = texture(screen_textures[screen_id_l], frag_tex_coord); color = GetScreen(screen_id_l);
else else
color = texture(screen_textures[screen_id_r], frag_tex_coord); color = GetScreen(screen_id_r);
} }