Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-01 19:29:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

push new

Browse source
This commit is contained in:
lizzie 2026-01-14 05:41:58 +00:00 • committed by crueter
parent 80bbeba430
commit 9b815a1125
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
.patch/snapdragon_gsr/0001-fix-glsl.patch
View file

@ -1,15 +1,14 @@
diff --git a/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag b/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag diff --git a/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag b/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag
index 7074999..2d322fb 100644 index 7074999..4f76e1a 100644
--- a/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag --- a/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag
+++ b/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag +++ b/sgsr/v1/include/glsl/sgsr1_shader_mobile.frag
@@ -1,4 +1,5 @@ @@ -1,4 +1,4 @@
-#version 300 es -#version 300 es
+#version 310 es +#version 460 core
+#extension GL_EXT_spec_constant_composites:require
//============================================================================================================ //============================================================================================================
// //
@@ -34,11 +35,10 @@ precision highp int; @@ -34,11 +34,10 @@ precision highp int;
//////////////////////// ////////////////////////
#if defined(UseUniformBlock) #if defined(UseUniformBlock)
@ -20,11 +19,11 @@ index 7074999..2d322fb 100644
+ highp vec4 ViewportInfo[1]; + highp vec4 ViewportInfo[1];
}; };
-layout(set = 0, binding = 1) uniform mediump sampler2D ps0; -layout(set = 0, binding = 1) uniform mediump sampler2D ps0;
+layout(set = 0, binding = 0) uniform mediump sampler2D ps0; +layout(set = 0, binding = 0) uniform sampler2D ps0;
#else #else
uniform highp vec4 ViewportInfo[1]; uniform highp vec4 ViewportInfo[1];
uniform mediump sampler2D ps0; uniform mediump sampler2D ps0;
@@ -63,9 +63,9 @@ vec2 weightY(float dx, float dy,float c, float std) @@ -63,9 +62,9 @@ vec2 weightY(float dx, float dy,float c, float std)
void main() void main()
{ {
@ -37,7 +36,7 @@ index 7074999..2d322fb 100644
vec4 color; vec4 color;
if(mode == 1) if(mode == 1)
@@ -93,10 +93,13 @@ void main() @@ -93,10 +92,13 @@ void main()
{ {
coord.x += ViewportInfo[0].x; coord.x += ViewportInfo[0].x;
@ -55,17 +54,16 @@ index 7074999..2d322fb 100644
float mean = (left.y+left.z+right.x+right.w)*0.25; float mean = (left.y+left.z+right.x+right.w)*0.25;
left = left - vec4(mean); left = left - vec4(mean);
diff --git a/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag b/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag diff --git a/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag b/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag
index d2df646..875cdbf 100644 index d2df646..116c572 100644
--- a/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag --- a/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag
+++ b/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag +++ b/sgsr/v1/include/glsl/sgsr1_shader_mobile_edge_direction.frag
@@ -1,4 +1,5 @@ @@ -1,4 +1,4 @@
-#version 300 es -#version 300 es
+#version 310 es +#version 460 core
+#extension GL_EXT_spec_constant_composites:require
//============================================================================================================ //============================================================================================================
// //
@@ -40,11 +41,10 @@ precision highp int; @@ -40,11 +40,10 @@ precision highp int;
//////////////////////// ////////////////////////
#if defined(UseUniformBlock) #if defined(UseUniformBlock)
@ -76,11 +74,11 @@ index d2df646..875cdbf 100644
+ highp vec4 ViewportInfo[1]; + highp vec4 ViewportInfo[1];
}; };
-layout(set = 0, binding = 1) uniform mediump sampler2D ps0; -layout(set = 0, binding = 1) uniform mediump sampler2D ps0;
+layout(set = 0, binding = 0) uniform mediump sampler2D ps0; +layout(set = 0, binding = 0) uniform sampler2D ps0;
#else #else
uniform highp vec4 ViewportInfo[1]; uniform highp vec4 ViewportInfo[1];
uniform mediump sampler2D ps0; uniform mediump sampler2D ps0;
@@ -124,10 +124,13 @@ void main() @@ -124,10 +123,13 @@ void main()
{ {
coord.x += ViewportInfo[0].x; coord.x += ViewportInfo[0].x;

3
src/video_core/renderer_vulkan/present/sgsr.cpp
View file

@ -17,7 +17,7 @@
namespace Vulkan { namespace Vulkan {
using PushConstants = std::array<u32, 4 * 4>; using PushConstants = std::array<u32, 4>;
SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image_count, VkExtent2D extent) SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image_count, VkExtent2D extent)
: m_device{device}, m_memory_allocator{memory_allocator} : m_device{device}, m_memory_allocator{memory_allocator}
@ -65,7 +65,6 @@ SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image
.pPushConstantRanges = &range, .pPushConstantRanges = &range,
}; };
m_pipeline_layout = m_device.GetLogical().CreatePipelineLayout(ci); m_pipeline_layout = m_device.GetLogical().CreatePipelineLayout(ci);
m_stage_pipeline[0] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[0])); m_stage_pipeline[0] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[0]));
m_stage_pipeline[1] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[1])); m_stage_pipeline[1] = CreateWrappedPipeline(m_device, m_renderpass, m_pipeline_layout, std::tie(m_vert_shader, m_stage_shader[1]));
} }