Chromium Code Reviews| Index: chrome/gpu/gpu_info_collector_mac.mm |
| =================================================================== |
| --- chrome/gpu/gpu_info_collector_mac.mm (revision 67161) |
| +++ chrome/gpu/gpu_info_collector_mac.mm (working copy) |
| @@ -81,13 +81,13 @@ |
| int shader_version = 0; |
| if (gl_major_version == 1) { |
| - char *gl_extensions_string = (char*)glGetString(GL_EXTENSIONS); |
| - if (strstr(gl_extensions_string, "GL_ARB_shading_language_100")) { |
| + const char *gl_extensions_string = (const char*)glGetString(GL_EXTENSIONS); |
| + if (gl_extensions_string && strstr(gl_extensions_string, "GL_ARB_shading_language_100")) { |
|
apatrick
2010/11/24 18:13:04
Do we do 80 chars in objective C files?
|
| gl_hlsl_major = 1; |
| gl_hlsl_minor = 0; |
| } |
| } else if (gl_major_version > 1) { |
| - char *glsl_version_string = (char*)glGetString(GL_SHADING_LANGUAGE_VERSION); |
| + const char *glsl_version_string = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION); |
|
apatrick
2010/11/24 18:13:04
Same here if that's the case.
|
| if (glsl_version_string) |
| sscanf(glsl_version_string, "%u.%u", &gl_hlsl_major, &gl_hlsl_minor); |
| } |