diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 00:49:24 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 00:49:24 +0000 |
| commit | 8fc6448e485d7702b7c21ca1dfc285cf868711a7 (patch) | |
| tree | 3b702818942170762c01e80d6cdf85a21db4ab28 /chrome/gpu/gpu_info_collector_mac.mm | |
| parent | 1a5fc691df478cfbffdb7e1ae5c19dfde73d2cb2 (diff) | |
| download | chromium_src-8fc6448e485d7702b7c21ca1dfc285cf868711a7.zip chromium_src-8fc6448e485d7702b7c21ca1dfc285cf868711a7.tar.gz chromium_src-8fc6448e485d7702b7c21ca1dfc285cf868711a7.tar.bz2 | |
Temporarily work around GPU process crash on Mac OS X.
BUG=52957
TEST=none (ran 3D CSS demos with --enable-accelerated-compositing)
Review URL: http://codereview.chromium.org/3150030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_info_collector_mac.mm')
| -rw-r--r-- | chrome/gpu/gpu_info_collector_mac.mm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/gpu/gpu_info_collector_mac.mm b/chrome/gpu/gpu_info_collector_mac.mm index 5ba93b7..0b494d3 100644 --- a/chrome/gpu/gpu_info_collector_mac.mm +++ b/chrome/gpu/gpu_info_collector_mac.mm @@ -55,6 +55,8 @@ static void CollectVideoCardInfo(CGDirectDisplayID displayID, CFReleaseIf(deviceIDRef); } +// TODO(maf): uncomment when using code below is re-enabled. +/* // Return a pointer to the last character with value c in string s. // Returns NULL if c is not found. static char* FindLastChar(char *s, char c) { @@ -67,6 +69,7 @@ static char* FindLastChar(char *s, char c) { } return s_found; } +*/ bool CollectGraphicsInfo(GPUInfo& gpu_info) { @@ -75,10 +78,13 @@ bool CollectGraphicsInfo(GPUInfo& gpu_info) { std::wstring driver_version = L""; uint32 pixel_shader_version = 0u; uint32 vertex_shader_version = 0u; - uint32 gl_version; + uint32 gl_version = 0u; CollectVideoCardInfo(kCGDirectMainDisplay, &vendor_id, &device_id); + // TODO(maf): when this is called, there is no OpenGL context + // current, so calls to glGetString crash. + /* char *gl_version_string = (char*)glGetString(GL_VERSION); char *gl_extensions_string = (char*)glGetString(GL_EXTENSIONS); @@ -124,6 +130,7 @@ bool CollectGraphicsInfo(GPUInfo& gpu_info) { gl_version = ((gl_major << 16) & 0xffff0000) + (gl_minor & 0x0000ffff); + */ gpu_info.SetGraphicsInfo(vendor_id, device_id, driver_version, pixel_shader_version, vertex_shader_version, |