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 /app/gfx | |
| 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 'app/gfx')
| -rw-r--r-- | app/gfx/gl/gl_context.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/gfx/gl/gl_context.cc b/app/gfx/gl/gl_context.cc index 83c483b..a07d30a 100644 --- a/app/gfx/gl/gl_context.cc +++ b/app/gfx/gl/gl_context.cc @@ -15,8 +15,7 @@ namespace gfx { std::string GLContext::GetExtensions() { DCHECK(IsCurrent()); - const char* ext = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)); - return std::string(ext ? ext : ""); + return std::string(reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS))); } bool GLContext::HasExtension(const char* name) { |