Fix sgsr2 shader code and include and add missing project into Androi…

…d project Signed-off-by: Rodrigo Holztrattner <[email protected]>
SnapdragonStudios · Dec 4, 2024 · 91bd6d3 · 91bd6d3
1 parent 8310484
commit 91bd6d3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/project/android/settings.gradle b/project/android/settings.gradle
@@ -1,4 +1,4 @@
-include ':empty', ':hello-gltf', ':hdrSwapchain', ':SubPass', ':shaderResolveTonemap', ':rotatedCopy', ':BloomImageProcessing', ':rayQueryShadows',':rayReflections',':sgsr'
+include ':empty', ':hello-gltf', ':hdrSwapchain', ':SubPass', ':shaderResolveTonemap', ':rotatedCopy', ':BloomImageProcessing', ':rayQueryShadows',':rayReflections',':sgsr',':sgsr2'
 
 project(':empty').projectDir = new File('../../samples/empty')
 project(':hello-gltf').projectDir = new File('../../samples/hello-gltf')

diff --git a/samples/sgsr2/shaders/sgsr2_activate.comp b/samples/sgsr2/shaders/sgsr2_activate.comp
@@ -1,4 +1,5 @@
 #version 320 es
+
 //============================================================================================================
 //
 //
@@ -88,10 +89,6 @@ void main()
         float Ksep = 1.37e-05f;
         float Kfov = params.cameraFovAngleHor;
         float Ksep_Kfov_diagonal = Ksep * Kfov * diagonal_length;
-<<<<<<< HEAD
-=======
-
->>>>>>> main
         for (int index = 0; index < 4; index+=2){
             vec4 gPrevdepth = textureGatherOffset(MotionDepthAlphaBuffer, PrevUV, sampleOffset[index], 2);
             float tdepth1 = min(gPrevdepth.x, gPrevdepth.y);

diff --git a/samples/sgsr2/shaders/sgsr2_convert.comp b/samples/sgsr2/shaders/sgsr2_convert.comp
@@ -1,4 +1,5 @@
 #version 320 es
+
 //============================================================================================================
 //
 //

diff --git a/samples/sgsr2/shaders/sgsr2_convert2.frag b/samples/sgsr2/shaders/sgsr2_convert2.frag
@@ -114,4 +114,4 @@ void main()
     }
     MotionDepthClipAlphaBuffer = vec4(motion, depthclip, 0.0);
 
-}
+}
diff --git a/samples/sgsr2/shaders/sgsr2_upscale.comp b/samples/sgsr2/shaders/sgsr2_upscale.comp
@@ -1,4 +1,5 @@
 #version 320 es
+
 //============================================================================================================
 //
 //

diff --git a/samples/sgsr2/shaders/sgsr2_upscale2.frag b/samples/sgsr2/shaders/sgsr2_upscale2.frag
@@ -284,4 +284,4 @@ void main()
     Upsampledcw.xyz = mix(HistoryColor, Upsampledcw.xyz, alpha);
 
     Output = vec4(Upsampledcw.xyz, 0.0);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,4 +114,4 @@ void main() @@
         }
         MotionDepthClipAlphaBuffer = vec4(motion, depthclip, 0.0);
-    }
+    }