add extra depth pass, before fog

Author: Try

game/graphics/renderer.cpp

@@ -117,6 +117,9 @@ void Renderer::resetSwapchain() {
   uboCopy = device.descriptors(Shaders::inst().copy);
   uboCopy.set(0,gbufEmission,Sampler::nearest());
 
+  uboCopyDepth = device.descriptors(Shaders::inst().copy);
+  uboCopyDepth.set(0, zbuffer);
+
   ssao.ssaoBuf = device.attachment(ssao.aoFormat, (swapchain.w()+1)/2,(swapchain.h()+1)/2);
   ssao.blurBuf = device.attachment(ssao.aoFormat, (swapchain.w()+1)/2,(swapchain.h()+1)/2);
 
@@ -243,7 +246,8 @@ void Renderer::dbgDraw(Tempest::Painter& p) {
   }
 
 void Renderer::draw(Tempest::Attachment& result, Tempest::Encoder<CommandBuffer>& cmd, uint8_t cmdId) {
-  auto wview = Gothic::inst().worldView();
+  auto& device = Resources::device();
+  auto  wview  = Gothic::inst().worldView();
   if(wview==nullptr) {
     cmd.setFramebuffer({{result, Vec4(), Tempest::Preserve}});
     return;
@@ -292,14 +296,19 @@ void Renderer::draw(Tempest::Attachment& result, Tempest::Encoder<CommandBuffer>
   wview->drawGBuffer(cmd,cmdId);
 
   drawSSAO(result,cmd,*wview);
-  cmd.setFramebuffer({{result, Tempest::Preserve, Tempest::Preserve}}, {zbuffer, Tempest::Preserve, Tempest::Discard});
+  cmd.setFramebuffer({{result, Tempest::Preserve, Tempest::Preserve}}, {zbuffer, Tempest::Preserve, Tempest::Preserve});
   wview->drawLights     (cmd,cmdId);
   wview->drawWater      (cmd,cmdId);
 
   wview->drawSky        (cmd,cmdId);
   wview->drawTranslucent(cmd,cmdId);
 
-  // cmd.setFramebuffer({{result, Tempest::Preserve, Tempest::Preserve}});
+  if(device.properties().hasSamplerFormat(zBufferFormat)){
+    cmd.setFramebuffer({{gbufDepth, 1.f, Tempest::Preserve}});
+    cmd.setUniforms(Shaders::inst().copy, uboCopyDepth);
+    cmd.draw(Resources::fsqVbo());
+    }
+  cmd.setFramebuffer({{result, Tempest::Preserve, Tempest::Preserve}});
   wview->drawFog        (cmd,cmdId);
   }
 

game/graphics/renderer.h

@@ -79,6 +79,6 @@ class Renderer final {
     Tempest::DescriptorSet    uboHiZPot;
     std::vector<Tempest::DescriptorSet> uboZMip;
 
-    Tempest::DescriptorSet    uboCopy;
+    Tempest::DescriptorSet    uboCopy, uboCopyDepth;
     Shaders                   stor;
   };

shader/sky/sky_egsr.frag

@@ -154,14 +154,10 @@ const vec3 debugColors[MAX_DEBUG_COLORS] = {
   vec3(0,0.5,1),
   };
 
-vec4 fog(vec2 uv, vec3 sunDir) {
-  // vec3  pos1     = inverse(vec3(inPos,1));
-  // vec3  posz     = inverse(vec3(inPos,z));
-  // vec3  pos0     = inverse(vec3(inPos,0));
-
+vec4 fog(vec2 uv, float z, vec3 sunDir) {
   float dMin = 0;
   float dMax = 0.9999;
-  float z    = texture(depth,uv).r;
+
   float dZ   = reconstructCSZ(   z, push.clipInfo);
   float d0   = reconstructCSZ(dMin, push.clipInfo);
   float d1   = reconstructCSZ(dMax, push.clipInfo);
@@ -180,10 +176,10 @@ vec4 fog(vec2 uv, vec3 sunDir) {
   return vec4(lum, fogDens);
   }
 #else
-vec4 fog(vec2 uv, vec3 sunDir) {
+vec4 fog(vec2 uv, float z, vec3 sunDir) {
   float dMin = 0.0;
   float dMax = 1.0;
-  float z    = texture(depth,uv).r;
+
   float dZ   = reconstructCSZ(   z, push.clipInfo);
   float d0   = reconstructCSZ(dMin, push.clipInfo);
   float d1   = reconstructCSZ(dMax, push.clipInfo);
@@ -259,11 +255,17 @@ void main() {
   vec2 uv     = inPos*vec2(0.5)+vec2(0.5);
   vec3 view   = normalize(inverse(vec3(inPos,1.0)));
   vec3 sunDir = push.sunDir;
+  float z     = textureLod(depth,uv,0).r;
+
+#if defined(FOG)
+  if(z>=1.0)
+    discard;
+#endif
 
   // NOTE: not a physical value, but dunno how to achive nice look without it
   float fogFixup = 20.0;
 
-  vec4  val      = fog(uv,push.sunDir) * fogFixup;
+  vec4  val      = fog(uv,z,push.sunDir) * fogFixup;
   vec3  lum      = val.rgb;
 #if defined(FOG)
   //outColor = fog(uv, sunDir);