Add ClientInfo...

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 25 matching lines @@
 #include "core/win/d3d9/renderer_d3d9.h"
 
 #include <vector>
 #include <d3dx9core.h>
 
 #include "core/cross/ierror_status.h"
 #include "core/cross/object_manager.h"
 #include "core/cross/renderer_platform.h"
 #include "core/cross/semantic_manager.h"
 #include "core/cross/service_dependency.h"
+#include "core/cross/client_info.h"
 #include "core/cross/shape.h"
 #include "core/cross/features.h"
 #include "core/cross/types.h"
 #include "core/win/d3d9/buffer_d3d9.h"
 #include "core/win/d3d9/d3d_entry_points.h"
 #include "core/win/d3d9/draw_element_d3d9.h"
 #include "core/win/d3d9/effect_d3d9.h"
 #include "core/win/d3d9/param_cache_d3d9.h"
 #include "core/win/d3d9/primitive_d3d9.h"
 #include "core/win/d3d9/render_surface_d3d9.h"
@@ skipping 303 matching lines @@
 // key is non-zero.
 bool IsForceSoftwareRendererEnabled() {
   HKEY key;
   if (FAILED(RegOpenKeyEx(HKEY_CURRENT_USER,
                           TEXT("Software\\Google\\o3d"),
                           0,
                           KEY_READ,
                           &key))) {
     return false;
   }
-  
+
   bool enabled = false;
   DWORD type;
   DWORD value;
   DWORD size = sizeof(value);
   if (SUCCEEDED(RegQueryValueEx(key,
                                 TEXT("ForceSoftwareRenderer"),
                                 NULL,
                                 &type,
                                 reinterpret_cast<LPBYTE>(&value),
                                 &size))) {
@@ skipping 11 matching lines @@
 // multisampling modes and selects the most advanced one available to create
 // a D3D Device with a back buffer containing depth and stencil buffers that
 // match the current display device.
 Renderer::InitStatus InitializeD3D9Context(
     HWND window,
     LPDIRECT3D9* d3d,
     LPDIRECT3DDEVICE9* d3d_device,
     D3DPRESENT_PARAMETERS* d3d_present_parameters,
     bool fullscreen,
     Features* features,
+    ServiceLocator* service_locator,
     int* out_width,
     int* out_height) {
 
   // Check registry to see if the developer has opted to force the software
   // renderer.
   Renderer::InitStatus status_hardware;
   if (IsForceSoftwareRendererEnabled()) {
     // Simulate GPU not up to spec.
     status_hardware = Renderer::GPU_NOT_UP_TO_SPEC;
   } else {
     // Create a hardware device.
     status_hardware = CreateDirect3D(Direct3DCreate9, d3d, features);
   }
-  
+
   if (status_hardware != Renderer::SUCCESS) {
     Renderer::InitStatus status_software = CreateDirect3D(
         Direct3DCreate9Software, d3d, features);
 
     // We should not be requiring caps that are not supported by the software
     // renderer.
     DCHECK(status_software != Renderer::GPU_NOT_UP_TO_SPEC);
 
     if (status_software != Renderer::SUCCESS) {
       // Report the hardware error. An error with the software renderer should
       // only mean that it is not available, which is normal.
       if (status_hardware == Renderer::INITIALIZATION_ERROR) {
         LOG(ERROR) << "Failed to create the initial D3D9 Interface";
       }
       return status_hardware;
     }
 
     SetupSoftwareRenderer(*d3d);
+
+    ServiceDependency<ClientInfoManager> client_info_manager(service_locator);

[apatrick, 2009/07/09 18:22:00]

GetService.

+    client_info_manager->SetSoftwareRenderer(true);
   }
 
   D3DDISPLAYMODE d3ddm;
   if (!HR((*d3d)->GetAdapterDisplayMode(D3DADAPTER_DEFAULT, &d3ddm)))
     return Renderer::GPU_NOT_UP_TO_SPEC;
 
   // NOTE: make sure the backbuffer matches this format, as it is
   // currently assumed to be 32-bit 8X8R8G8B
 
   ZeroMemory(d3d_present_parameters, sizeof(*d3d_present_parameters));
@@ skipping 528 matching lines @@
   int height;
   d3d_ = NULL;
   d3d_device_ = NULL;
   InitStatus init_status = InitializeD3D9Context(
       window,
       &d3d_,
       &d3d_device_,
       &d3d_present_parameters_,
       fullscreen_,
       features(),
+      service_locator(),
       &width,
       &height);
   if (init_status != SUCCESS) {
     DLOG(ERROR) << "Failed to initialize D3D9.";
     return init_status;
   }
 
   D3DCAPS9 d3d_caps;
   if (!HR(d3d_->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &d3d_caps))) {
     DLOG(ERROR) << "Failed to get device capabilities.";
@@ skipping 788 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