From 89f580b14355e7342cff030747d12ec18f8ca012 Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Thu, 15 Oct 2009 02:57:43 +0000 Subject: 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 --- o3d/DEPS | 2 +- o3d/DEPS_chrome | 2 +- o3d/DEPS_gyp | 2 +- o3d/core/win/d3d9/renderer_d3d9.cc | 40 +++--- o3d/tests/selenium/javascript_unit_test_list.txt | 3 +- o3d/tests/selenium/selenium.gyp | 1 + .../selenium/tests/render-target-clear-test.html | 156 +++++++++++++++++++++ 7 files changed, 186 insertions(+), 20 deletions(-) create mode 100644 o3d/tests/selenium/tests/render-target-clear-test.html (limited to 'o3d') 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 current_surface; - if (!HR(d3d_device()->GetRenderTarget(0, ¤t_surface))) - return; - - CComPtr current_depth_surface; - if (!HR(d3d_device()->GetDepthStencilSurface(¤t_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 @@ + + + + + + + +Render Target Clear Test. + + + + + + + + + +

Tests that render targets clear correctly.

+Should be red, green, blue on dark blue background. +
+ + + -- cgit v1.1