diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 22:26:48 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 22:26:48 +0000 |
| commit | ce383f32a1bfbe4ca33b88a0cbbb79c7f077428d (patch) | |
| tree | ff8effb0f58e6f1b0395a0c98f7e385e43cc1f23 /chrome/gpu | |
| parent | e667807890b931d41a4529165bedef5203382bbd (diff) | |
| download | chromium_src-ce383f32a1bfbe4ca33b88a0cbbb79c7f077428d.zip chromium_src-ce383f32a1bfbe4ca33b88a0cbbb79c7f077428d.tar.gz chromium_src-ce383f32a1bfbe4ca33b88a0cbbb79c7f077428d.tar.bz2 | |
Revert 67293 BrowserTestCanLaunchWithOSMesa was consistently failing - Initialize destinations variables before calling GL functions
because if the context is lost those variables will
be uninitialized.
TEST=ran chrome, conformance tests, unit tests and hand edited gles2_demo to test
BUG=none
Review URL: http://codereview.chromium.org/5305005
TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/5383001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/gpu_info_collector_mac.mm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/gpu/gpu_info_collector_mac.mm b/chrome/gpu/gpu_info_collector_mac.mm index 24c809d..9da958c 100644 --- a/chrome/gpu/gpu_info_collector_mac.mm +++ b/chrome/gpu/gpu_info_collector_mac.mm @@ -81,15 +81,13 @@ static int GetShaderNumericVersion(int gl_major_version) { int shader_version = 0; if (gl_major_version == 1) { - const char *gl_extensions_string = (const char*)glGetString(GL_EXTENSIONS); - if (gl_extensions_string && - strstr(gl_extensions_string, "GL_ARB_shading_language_100")) { + char *gl_extensions_string = (char*)glGetString(GL_EXTENSIONS); + if (strstr(gl_extensions_string, "GL_ARB_shading_language_100")) { gl_hlsl_major = 1; gl_hlsl_minor = 0; } } else if (gl_major_version > 1) { - const char *glsl_version_string = - (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION); + char *glsl_version_string = (char*)glGetString(GL_SHADING_LANGUAGE_VERSION); if (glsl_version_string) sscanf(glsl_version_string, "%u.%u", &gl_hlsl_major, &gl_hlsl_minor); } |