diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 01:00:58 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-29 01:00:58 +0000 |
| commit | 9a3a072c7b353947c3aa6153c82f11eca6de366d (patch) | |
| tree | 13dd074663897c4058eacee604efafb970cbce3a /o3d | |
| parent | 55284cc95c97e20ccd1364afb37c9fefc64b760b (diff) | |
| download | chromium_src-9a3a072c7b353947c3aa6153c82f11eca6de366d.zip chromium_src-9a3a072c7b353947c3aa6153c82f11eca6de366d.tar.gz chromium_src-9a3a072c7b353947c3aa6153c82f11eca6de366d.tar.bz2 | |
Fix for GL unit_tests.
Apparently there are issues with making a window
off screen. We were creating a 512/512 window
-1000 pixels off the screen.
This worked before but recently it stopped working
on my (gman) machine. I checked by building
the release build 0.1.42.3 and that version
fails as well where as it used to work. I don't
know what changed on my machine.
Also added CS_OWNDC in several places.
Review URL: http://codereview.chromium.org/339057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/command_buffer/service/cross/gl/gapi_gl.cc | 2 | ||||
| -rw-r--r-- | o3d/core/cross/gl/renderer_gl.cc | 2 | ||||
| -rw-r--r-- | o3d/tests/common/win/testing_common.cc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/o3d/command_buffer/service/cross/gl/gapi_gl.cc b/o3d/command_buffer/service/cross/gl/gapi_gl.cc index 721e2c4..43d85a7 100644 --- a/o3d/command_buffer/service/cross/gl/gapi_gl.cc +++ b/o3d/command_buffer/service/cross/gl/gapi_gl.cc @@ -119,7 +119,7 @@ static bool GetWindowsPixelFormat(HWND window, } WNDCLASS intermediate_class; - intermediate_class.style = CS_HREDRAW | CS_VREDRAW; + intermediate_class.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; intermediate_class.lpfnWndProc = IntermediateWindowProc; intermediate_class.cbClsExtra = 0; intermediate_class.cbWndExtra = 0; diff --git a/o3d/core/cross/gl/renderer_gl.cc b/o3d/core/cross/gl/renderer_gl.cc index 0e2f683..8568de1 100644 --- a/o3d/core/cross/gl/renderer_gl.cc +++ b/o3d/core/cross/gl/renderer_gl.cc @@ -822,7 +822,7 @@ Renderer::InitStatus GetWindowsPixelFormat(HWND window, } WNDCLASS intermediate_class; - intermediate_class.style = CS_HREDRAW | CS_VREDRAW; + intermediate_class.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; intermediate_class.lpfnWndProc = IntermediateWindowProc; intermediate_class.cbClsExtra = 0; intermediate_class.cbWndExtra = 0; diff --git a/o3d/tests/common/win/testing_common.cc b/o3d/tests/common/win/testing_common.cc index 0a31823..acc4e13 100644 --- a/o3d/tests/common/win/testing_common.cc +++ b/o3d/tests/common/win/testing_common.cc @@ -67,8 +67,8 @@ using o3d::gpu_plugin::StubNPBrowser; using o3d::RendererCBLocal; #endif -const int kWindowWidth = 512; -const int kWindowHeight = 512; +const int kWindowWidth = 16; +const int kWindowHeight = 16; o3d::ServiceLocator* g_service_locator = NULL; o3d::DisplayWindow* g_display_window = NULL; @@ -109,7 +109,7 @@ int WINAPI WinMain(HINSTANCE instance, wc.lpszClassName = L"MY_WINDOWS_CLASS"; wc.cbSize = sizeof(WNDCLASSEX); - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; wc.lpfnWndProc = ::WindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -130,8 +130,8 @@ int WINAPI WinMain(HINSTANCE instance, wc.lpszClassName, L"", WS_OVERLAPPEDWINDOW, - -1000, - 0, + 10, + 10, kWindowWidth, kWindowHeight, 0, |