commit 71bd4b349848e17b3180458255764d626f8e8035
author Tony Barbour <tony@LunarG.com> Tue Jul 21 17:00:26 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Jul 22 08:50:07 2015 -0600
tree 2268a92df76e3fd94ea7a35a2d430ef662d37404
parent c1eb1a53d68b07692c84e913e26a5c27821a1d0c

tests: Use load op clears by default

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 082280f..02427a9 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -337,10 +337,12 @@
 
 void VkRenderTest::GenericDrawPreparation(VkCommandBufferObj *cmdBuffer, VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet)
 {
-    if (m_depthStencil->Initialized()) {
-        cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, m_depthStencil);
-    } else {
-        cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, NULL);
+    if (!m_clear_via_load_op) {
+        if (m_depthStencil->Initialized()) {
+            cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, m_depthStencil);
+        } else {
+            cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, NULL);
+        }
     }
 
     cmdBuffer->PrepareAttachments();

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 761abe5..7eb5856 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -41,7 +41,7 @@
     m_height( 256.0 ),                  // default window height
     m_render_target_fmt( VK_FORMAT_R8G8B8A8_UNORM ),
     m_depth_stencil_fmt( VK_FORMAT_UNDEFINED ),
-    m_clear_via_load_op( false ),
+    m_clear_via_load_op( true ),
     m_depth_clear_color( 1.0 ),
     m_stencil_clear_color( 0 ),
     m_depthStencil( NULL ),
@@ -348,7 +348,7 @@
 
     if (dsBinding) {
         att.format = m_depth_stencil_fmt;
-        att.loadOp =  VK_ATTACHMENT_LOAD_OP_LOAD;
+        att.loadOp = (m_clear_via_load_op) ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_LOAD;;
         att.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
         att.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
         att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE;