From fbd83c9e842bb5eabd888e367100dc19baa8161a Mon Sep 17 00:00:00 2001 From: Jonathas Costa Date: Fri, 5 Jun 2020 17:15:54 -0400 Subject: [PATCH] Removed hack and fixed SGCT. --- apps/OpenSpace/ext/sgct | 2 +- modules/base/shaders/grid_fs.glsl | 5 +---- modules/base/shaders/grid_vs.glsl | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 902ad00320..16b4804681 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 902ad00320c79b3f876530698ec1828c8dfceaab +Subproject commit 16b4804681f12681deeaf321efdfe3b92e7d28e3 diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl index c3073eebd5..e2865a33b4 100644 --- a/modules/base/shaders/grid_fs.glsl +++ b/modules/base/shaders/grid_fs.glsl @@ -27,7 +27,6 @@ in float vs_screenSpaceDepth; in vec4 vs_positionViewSpace; -flat in double vs_double_depth; uniform vec4 gridColor; uniform float opacity; @@ -36,9 +35,7 @@ Fragment getFragment() { Fragment frag; frag.color = gridColor; frag.color.a *= opacity; - // JCC: Temp solution for depth precision problems. - frag.depth = float(vs_double_depth); - //frag.depth = vs_screenSpaceDepth; + frag.depth = vs_screenSpaceDepth; frag.gPosition = vs_positionViewSpace; // There is no normal here diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl index 13d227aed4..c6006a73ef 100644 --- a/modules/base/shaders/grid_vs.glsl +++ b/modules/base/shaders/grid_vs.glsl @@ -30,7 +30,6 @@ layout(location = 0) in vec3 in_position; out float vs_screenSpaceDepth; out vec4 vs_positionViewSpace; -flat out double vs_double_depth; uniform dmat4 modelViewTransform; uniform dmat4 projectionTransform; @@ -40,7 +39,6 @@ void main() { dvec4 positionClipSpace = projectionTransform * positionViewSpace; vec4 positionScreenSpace = z_normalization(vec4(positionClipSpace)); - vs_double_depth = positionClipSpace.w; vs_screenSpaceDepth = float(positionClipSpace.w); vs_positionViewSpace = vec4(positionViewSpace);