Fix clearing render targets in D3D if there...

core/win/d3d9/renderer_d3d9.cc

 /*
  * 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.
@@ skipping 1010 matching lines @@
   d3d_device_ = NULL;
   d3d_ = NULL;
 }
 
 void RendererD3D9::PlatformSpecificClear(const Float4 &color,
                                          bool color_flag,
                                          float depth,
                                          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(
+  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),
+         (color_flag ? D3DCLEAR_TARGET  : 0) |
+         (depth_flag ? D3DCLEAR_ZBUFFER : 0) |
+         (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,
                                        int top,
                                        int width,
                                        int height,
                                        float min_z,
                                        float max_z) {
   D3DVIEWPORT9 viewport;
 
@@ skipping 481 matching lines @@
 
 void RendererD3D9::SetRenderSurfacesPlatformSpecific(
     const RenderSurface* surface,
     const RenderDepthStencilSurface* surface_depth) {
   const RenderSurfaceD3D9 *d3d_render_surface =
       down_cast<const RenderSurfaceD3D9*>(surface);
   const RenderDepthStencilSurfaceD3D9 *d3d_render_depth_surface =
       down_cast<const RenderDepthStencilSurfaceD3D9*>(surface_depth);
 
   IDirect3DSurface9 *d3d_surface =
-      d3d_render_surface ? d3d_render_surface->GetSurfaceHandle() : NULL;
+      d3d_render_surface ? d3d_render_surface->GetSurfaceHandle() :
+      back_buffer_surface_;
   IDirect3DSurface9 *d3d_depth_surface = d3d_render_depth_surface ?
-      d3d_render_depth_surface->GetSurfaceHandle() : NULL;
+      d3d_render_depth_surface->GetSurfaceHandle() : back_buffer_depth_surface_;
 
   // At least one of the surfaces must be non-null.
   DCHECK(d3d_surface || d3d_depth_surface);
 
   HR(d3d_device()->SetRenderTarget(0, d3d_surface));
   HR(d3d_device()->SetDepthStencilSurface(d3d_depth_surface));
 }
 
 void RendererD3D9::SetBackBufferPlatformSpecific() {
   HR(d3d_device()->SetRenderTarget(0, back_buffer_surface_));
@@ skipping 87 matching lines @@
   static int swizzle_table[] = { 2, 1, 0, 3, };
   return swizzle_table;
 }
 
 // This is a factory function for creating Renderer objects.  Since
 // we're implementing D3D9, we only ever return a D3D9 renderer.
 Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) {
   return RendererD3D9::CreateDefault(service_locator);
 }
 }  // namespace o3d