Browse Source

Fix bug in DBG

Panagiotis Christopoulos Charitos 10 years ago
parent
commit
bcb228d8bc
4 changed files with 5 additions and 6 deletions
  1. 0 2
      src/renderer/Fs.cpp
  2. 0 2
      src/renderer/Lf.cpp
  3. 3 2
      src/renderer/Ms.cpp
  4. 2 0
      src/renderer/Sm.cpp

+ 0 - 2
src/renderer/Fs.cpp

@@ -38,7 +38,6 @@ Error Fs::run(CommandBufferHandle& cmdb)
 	m_fb.bind(cmdb);
 	m_fb.bind(cmdb);
 
 
 	cmdb.enableDepthTest(true);
 	cmdb.enableDepthTest(true);
-	cmdb.setDepthWriteMask(false);
 	cmdb.enableBlend(true);
 	cmdb.enableBlend(true);
 
 
 	RenderableDrawer& drawer = m_r->getSceneDrawer();
 	RenderableDrawer& drawer = m_r->getSceneDrawer();
@@ -59,7 +58,6 @@ Error Fs::run(CommandBufferHandle& cmdb)
 		drawer.finishDraw();
 		drawer.finishDraw();
 
 
 		cmdb.enableDepthTest(false);
 		cmdb.enableDepthTest(false);
-		cmdb.setDepthWriteMask(true);
 		cmdb.enableBlend(false);
 		cmdb.enableBlend(false);
 	}
 	}
 
 

+ 0 - 2
src/renderer/Lf.cpp

@@ -155,7 +155,6 @@ void Lf::runOcclusionTests(CommandBufferHandle& cmdb)
 
 
 		// Setup state
 		// Setup state
 		cmdb.setColorWriteMask(false, false, false, false);
 		cmdb.setColorWriteMask(false, false, false, false);
-		cmdb.setDepthWriteMask(false);
 		cmdb.enableDepthTest(true);
 		cmdb.enableDepthTest(true);
 		m_occlusionPpline.bind(cmdb);
 		m_occlusionPpline.bind(cmdb);
 
 
@@ -201,7 +200,6 @@ void Lf::runOcclusionTests(CommandBufferHandle& cmdb)
 
 
 		// Restore state
 		// Restore state
 		cmdb.setColorWriteMask(true, true, true, true);
 		cmdb.setColorWriteMask(true, true, true, true);
-		cmdb.setDepthWriteMask(true);
 		cmdb.enableDepthTest(false);
 		cmdb.enableDepthTest(false);
 	}
 	}
 }
 }

+ 3 - 2
src/renderer/Ms.cpp

@@ -89,13 +89,13 @@ Error Ms::run(CommandBufferHandle& cmdb)
 		planeId = 1;
 		planeId = 1;
 	}
 	}
 
 
-	m_planes[planeId].m_fb.bind(cmdb);
-
 	cmdb.setViewport(0, 0, m_r->getWidth(), m_r->getHeight());
 	cmdb.setViewport(0, 0, m_r->getWidth(), m_r->getHeight());
 
 
 	cmdb.enableDepthTest(true);
 	cmdb.enableDepthTest(true);
 	cmdb.setDepthWriteMask(true);
 	cmdb.setDepthWriteMask(true);
 
 
+	m_planes[planeId].m_fb.bind(cmdb);
+
 	/*if(m_ez.getEnabled())
 	/*if(m_ez.getEnabled())
 	{
 	{
 		cmdb.setDepthFunction(GL_LESS);
 		cmdb.setDepthFunction(GL_LESS);
@@ -140,6 +140,7 @@ Error Ms::run(CommandBufferHandle& cmdb)
 	}
 	}
 
 
 	cmdb.enableDepthTest(false);
 	cmdb.enableDepthTest(false);
+	cmdb.setDepthWriteMask(false);
 
 
 	return ErrorCode::NONE;
 	return ErrorCode::NONE;
 }
 }

+ 2 - 0
src/renderer/Sm.cpp

@@ -85,6 +85,7 @@ void Sm::prepareDraw(CommandBufferHandle& cmdBuff)
 	// disable color & blend & enable depth test
 	// disable color & blend & enable depth test
 
 
 	cmdBuff.enableDepthTest(true);
 	cmdBuff.enableDepthTest(true);
+	cmdBuff.setDepthWriteMask(true);
 	cmdBuff.setColorWriteMask(false, false, false, false);
 	cmdBuff.setColorWriteMask(false, false, false, false);
 
 
 	// for artifacts
 	// for artifacts
@@ -101,6 +102,7 @@ void Sm::finishDraw(CommandBufferHandle& cmdBuff)
 	m_r->getSceneDrawer().finishDraw();
 	m_r->getSceneDrawer().finishDraw();
 
 
 	cmdBuff.enableDepthTest(false);
 	cmdBuff.enableDepthTest(false);
+	cmdBuff.setDepthWriteMask(false);
 	cmdBuff.enablePolygonOffset(false);
 	cmdBuff.enablePolygonOffset(false);
 	cmdBuff.setColorWriteMask(true, true, true, true);
 	cmdBuff.setColorWriteMask(true, true, true, true);
 }
 }