Fix clearing render targets in D3D if there

is no associated depth buffer.

There's something I don't get here. I thought
the dimensions of the depth-stencil and the
render target had to match but apparently they
don't?

Review URL: http://codereview.chromium.org/270100

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29084 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 186 insertions, 20 deletions

diff --git a/o3d/DEPS b/o3d/DEPS
index 9cda2c1..a8ea48b 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -3,7 +3,7 @@ vars = {
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "54",
   "chromium_rev": "22547",
-  "o3d_code_rev": "149",
+  "o3d_code_rev": "154",
   "skia_rev": "279",
   "gyp_rev": "606",
   "gtest_rev": "267",
diff --git a/o3d/DEPS_chrome b/o3d/DEPS_chrome
index 0635b87..218f772 100644
--- a/o3d/DEPS_chrome
+++ b/o3d/DEPS_chrome
@@ -1,5 +1,5 @@
 vars = {
-  "o3d_code_rev": "149",
+  "o3d_code_rev": "154",
 }
 
 deps = {
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 32c9b23..ec6258a 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -2,7 +2,7 @@ vars = {
   "chromium_trunk": "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "56",
   "chromium_rev": "28829",
-  "o3d_code_rev": "149",
+  "o3d_code_rev": "154",
   "skia_rev": "376",
   "gyp_rev": "697",
   "gtest_rev": "329",
diff --git a/o3d/core/win/d3d9/renderer_d3d9.cc b/o3d/core/win/d3d9/renderer_d3d9.cc
index f667ee4..ddc144c 100644
--- a/o3d/core/win/d3d9/renderer_d3d9.cc
+++ b/o3d/core/win/d3d9/renderer_d3d9.cc
@@ -842,6 +842,8 @@ RendererD3D9::RendererD3D9(ServiceLocator* service_locator)
       off_screen_surface_(NULL),
       back_buffer_surface_(NULL),
       back_buffer_depth_surface_(NULL),
+      current_d3d_surface_(NULL),
+      current_d3d_depth_surface_(NULL),
       have_device_(false),
       fullscreen_(false),
       fullscreen_message_font_(NULL),
@@ -1028,29 +1030,23 @@ void RendererD3D9::PlatformSpecificClear(const Float4 &color,
                                          bool depth_flag,
                                          int stencil,
                                          bool stencil_flag) {
-  // is this safe to call inside BeginScene/EndScene?
-  CComPtr<IDirect3DSurface9> current_surface;
-  if (!HR(d3d_device()->GetRenderTarget(0, &current_surface)))
-    return;
-
-  CComPtr<IDirect3DSurface9> current_depth_surface;
-  if (!HR(d3d_device()->GetDepthStencilSurface(&current_depth_surface)))
-    return;
-
-  // Conditionally clear the properties of the back buffer based on the
-  // argument flags, and the existence of currently bound buffers.
-  HR(d3d_device_->Clear(
+  // Conditionally clear the properties of the current render target or back
+  // buffer based on the argument flags, and the existence of currently bound
+  // buffers.
+  if (!HR(d3d_device_->Clear(
          0,
          NULL,
-         ((color_flag && current_surface) ? D3DCLEAR_TARGET  : 0) |
-         ((depth_flag && current_depth_surface) ? D3DCLEAR_ZBUFFER : 0) |
-         ((stencil_flag && current_depth_surface) ? D3DCLEAR_STENCIL : 0),
+         ((current_d3d_surface_ && color_flag) ? D3DCLEAR_TARGET  : 0) |
+         ((current_d3d_depth_surface_ && depth_flag) ? D3DCLEAR_ZBUFFER : 0) |
+         ((current_d3d_depth_surface_ && stencil_flag ? D3DCLEAR_STENCIL : 0)),
          D3DCOLOR_COLORVALUE(color[0],
                              color[1],
                              color[2],
                              color[3]),
          depth,
-         stencil));
+         stencil))) {
+    DLOG(ERROR) << "Clear Failed.";
+  }
 }
 
 void RendererD3D9::SetViewportInPixels(int left,
@@ -1426,6 +1422,9 @@ bool RendererD3D9::PlatformSpecificStartRendering() {
     back_buffer_depth_surface_ = NULL;
   }
 
+  current_d3d_surface_ = back_buffer_surface_;
+  current_d3d_depth_surface_ = back_buffer_depth_surface_;
+
   return result;
 }
 
@@ -1449,6 +1448,9 @@ void RendererD3D9::PlatformSpecificEndDraw() {
 }
 
 void RendererD3D9::PlatformSpecificFinishRendering() {
+  current_d3d_surface_ = NULL;
+  current_d3d_depth_surface_ = NULL;
+
   if (have_device_) {
     // Release the back-buffer references.
     back_buffer_surface_ = NULL;
@@ -1559,11 +1561,17 @@ void RendererD3D9::SetRenderSurfacesPlatformSpecific(
   // At least one of the surfaces must be non-null.
   DCHECK(d3d_surface || d3d_depth_surface);
 
+  current_d3d_surface_ = d3d_surface;
+  current_d3d_depth_surface_ = d3d_depth_surface;
+
   HR(d3d_device()->SetRenderTarget(0, d3d_surface));
   HR(d3d_device()->SetDepthStencilSurface(d3d_depth_surface));
 }
 
 void RendererD3D9::SetBackBufferPlatformSpecific() {
+  current_d3d_surface_ = back_buffer_surface_;
+  current_d3d_depth_surface_ = back_buffer_depth_surface_;
+
   HR(d3d_device()->SetRenderTarget(0, back_buffer_surface_));
   HR(d3d_device()->SetDepthStencilSurface(back_buffer_depth_surface_));
 }
diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt
index 38069eb6..ec11f4e 100644
--- a/o3d/tests/selenium/javascript_unit_test_list.txt
+++ b/o3d/tests/selenium/javascript_unit_test_list.txt
@@ -49,7 +49,7 @@
 #       environment(s) where the test should be skipped.
 #       Default = ""
 #
-#   pdiff_edge_ignore_off : Turn off edge detection function in pdiff. 
+#   pdiff_edge_ignore_off : Turn off edge detection function in pdiff.
 #       By default, it's on with a default edge detect threshold 5.
 #
 #   pdiff_edge_threshold(0 to 7) : Set edge detect threshold in pdiff.
@@ -78,6 +78,7 @@ small   pixel-perfection      screenshot pdiff_threshold(200) pdiff_threshold_ma
 medium  offscreen-test
 medium  texture-set-test      screenshot
 medium  param-array-test      screenshot
+small   render-target-clear-test screenshot
 small   no-rendergraph        screenshot
 small   non-cachable-params   screenshot pdiff_threshold(200)
 small   type-test
diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp
index 1d11dea..d32014c 100644
--- a/o3d/tests/selenium/selenium.gyp
+++ b/o3d/tests/selenium/selenium.gyp
@@ -38,6 +38,7 @@
             'tests/pixel-perfection.html',
             'tests/quaternion-test.html',
             'tests/render-test.html',
+            'tests/render-target-clear-test.html',
             'tests/serialization-test.html',
             'tests/test-test.html',
             'tests/texture-set-test.html',
diff --git a/o3d/tests/selenium/tests/render-target-clear-test.html b/o3d/tests/selenium/tests/render-target-clear-test.html
new file mode 100644
index 0000000..91c50b7
--- /dev/null
+++ b/o3d/tests/selenium/tests/render-target-clear-test.html
@@ -0,0 +1,156 @@
+<!--

+Copyright 2009, Google Inc.

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are

+met:

+

+    * Redistributions of source code must retain the above copyright

+notice, this list of conditions and the following disclaimer.

+    * Redistributions in binary form must reproduce the above

+copyright notice, this list of conditions and the following disclaimer

+in the documentation and/or other materials provided with the

+distribution.

+    * Neither the name of Google Inc. nor the names of its

+contributors may be used to endorse or promote products derived from

+this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+-->

+<!--

+Tests that Render Targets clear correctly.

+-->

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"

+  "http://www.w3.org/TR/html4/loose.dtd">

+<html>

+<head>

+<meta http-equiv="content-type" content="text/html; charset=UTF-8">

+<title>

+Render Target Clear Test.

+</title>

+<link rel="stylesheet" type="text/css" href="assets/style.css" />

+<!-- Include sample javascript library functions-->

+<script type="text/javascript" src="../../../samples/o3djs/base.js"></script>

+

+<!-- Our javascript code -->

+<script type="text/javascript" id="o3dscript">

+o3djs.require('o3djs.util');

+o3djs.require('o3djs.math');

+o3djs.require('o3djs.rendergraph');

+o3djs.require('o3djs.primitives');

+o3djs.require('o3djs.material');

+

+// Events

+// init() once the page has finished loading.

+// unload() when the page is unloaded.

+window.onload = init;

+window.onunload = unload;

+

+// global variables

+var g_o3dElement;

+var g_o3d;

+var g_math;

+var g_client;

+var g_viewInfo;

+var g_pack;

+var g_root;

+var g_o3dElement;

+

+/**

+ * Creates the client area.

+ */

+function init() {

+  o3djs.util.makeClients(initStep2);

+}

+

+/**

+ * Initializes O3D and creates one shape.

+ * @param {Array} clientElements Array of o3d object elements.

+ */

+function initStep2(clientElements) {

+  // Initializes global variables and libraries.

+  g_o3dElement = clientElements[0];

+  g_o3d = g_o3dElement.o3d;

+  g_math = o3djs.math;

+  g_client = g_o3dElement.client;

+

+  // Creates a pack to manage our resources/assets

+  g_pack = g_client.createPack();

+

+  g_root = g_pack.createObject('Transform');

+

+  g_viewInfo = o3djs.rendergraph.createBasicView(

+      g_pack,

+      g_root,

+      g_client.renderGraphRoot,

+      [0.2, 0.3, 0.4, 1]);

+

+  var clientWidth = g_client.width;

+  var clientHeight = g_client.height;

+  g_viewInfo.drawContext.projection = g_math.matrix4.orthographic(

+      -clientWidth * 0.5 + 0.5,

+      clientWidth * 0.5 + 0.5,

+      -clientHeight * 0.5 + 0.5,

+      clientHeight * 0.5 + 0.5,

+      0.001,

+      1000);

+  g_viewInfo.drawContext.view = g_math.matrix4.lookAt(

+      [0, 500, 0], // eye

+      [0, 0, 0],   // target

+      [0, 0, -1]); // up

+

+  for (var ii = 0; ii < 3; ++ii) {

+    var texture = g_pack.createTexture2D(

+        256, 256, g_o3d.Texture.ARGB8, 1, true);

+    var surface = texture.getRenderSurface(0);

+    var renderSet = g_pack.createObject('RenderSurfaceSet');

+    renderSet.renderSurface = surface;

+    // Make render before the main display.

+    renderSet.priority = -10 + ii;

+

+    var material = o3djs.material.createConstantMaterial(

+        g_pack, g_viewInfo, texture);

+    var shape = o3djs.primitives.createPlane(g_pack, material, 128, 128, 1, 1);

+    var transform = g_pack.createObject("Transform");

+    transform.translate(-200 + 150 * ii, 0, 0);

+    transform.parent = g_root;

+    transform.addShape(shape);

+    var clearColor = [0, 0, 0, 1];

+    clearColor[ii] = 1;

+    var viewInfo = o3djs.rendergraph.createBasicView(

+        g_pack, null, renderSet, clearColor);

+    // Splice it into the render graph AFTER everything is setup.

+    renderSet.parent = g_client.renderGraphRoot;

+  }

+

+  window.g_testResult = true;

+}

+

+/**

+ * Remove any callbacks so they don't get called after the page has unloaded.

+ */

+function unload() {

+  if (g_client) {

+    g_client.cleanup();

+  }

+}

+</script>

+</head>

+<body>

+<h1>Tests that render targets clear correctly.</h1>

+Should be red, green, blue on dark blue background.

+<div id="o3d" style="width: 600px; height: 600px"></div>

+</body>

+</html>

+