Chromium Code Reviews| Index: core/win/d3d9/renderer_d3d9.cc |
| =================================================================== |
| --- core/win/d3d9/renderer_d3d9.cc (revision 20119) |
| +++ core/win/d3d9/renderer_d3d9.cc (working copy) |
| @@ -43,6 +43,7 @@ |
| #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" |
| @@ -366,7 +367,7 @@ |
| &key))) { |
| return false; |
| } |
| - |
| + |
| bool enabled = false; |
| DWORD type; |
| DWORD value; |
| @@ -398,6 +399,7 @@ |
| D3DPRESENT_PARAMETERS* d3d_present_parameters, |
| bool fullscreen, |
| Features* features, |
| + ServiceLocator* service_locator, |
| int* out_width, |
| int* out_height) { |
| @@ -411,7 +413,7 @@ |
| // Create a hardware device. |
| status_hardware = CreateDirect3D(Direct3DCreate9, d3d, features); |
| } |
| - |
| + |
| if (status_hardware != Renderer::SUCCESS) { |
| Renderer::InitStatus status_software = CreateDirect3D( |
| Direct3DCreate9Software, d3d, features); |
| @@ -430,6 +432,9 @@ |
| } |
| SetupSoftwareRenderer(*d3d); |
| + |
| + ServiceDependency<ClientInfoManager> client_info_manager(service_locator); |
|
apatrick
2009/07/09 18:22:00
GetService.
|
| + client_info_manager->SetSoftwareRenderer(true); |
| } |
| D3DDISPLAYMODE d3ddm; |
| @@ -978,6 +983,7 @@ |
| &d3d_present_parameters_, |
| fullscreen_, |
| features(), |
| + service_locator(), |
| &width, |
| &height); |
| if (init_status != SUCCESS) { |