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 /media | |
| 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 'media')
| -rw-r--r-- | media/tools/player_x11/gl_video_renderer.cc | 6 | ||||
| -rw-r--r-- | media/tools/player_x11/gles_video_renderer.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc index 68b317f..eef1a25 100644 --- a/media/tools/player_x11/gl_video_renderer.cc +++ b/media/tools/player_x11/gl_video_renderer.cc @@ -169,7 +169,7 @@ bool GlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) { glGetShaderiv(vertex_shader, GL_COMPILE_STATUS, &result); if (!result) { char log[kErrorSize]; - int len = 0; + int len; glGetShaderInfoLog(vertex_shader, kErrorSize - 1, &len, log); log[kErrorSize - 1] = 0; LOG(FATAL) << log; @@ -186,7 +186,7 @@ bool GlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) { glGetShaderiv(fragment_shader, GL_COMPILE_STATUS, &result); if (!result) { char log[kErrorSize]; - int len = 0; + int len; glGetShaderInfoLog(fragment_shader, kErrorSize - 1, &len, log); log[kErrorSize - 1] = 0; LOG(FATAL) << log; @@ -199,7 +199,7 @@ bool GlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) { glGetProgramiv(program, GL_LINK_STATUS, &result); if (!result) { char log[kErrorSize]; - int len = 0; + int len; glGetProgramInfoLog(program, kErrorSize - 1, &len, log); log[kErrorSize - 1] = 0; LOG(FATAL) << log; diff --git a/media/tools/player_x11/gles_video_renderer.cc b/media/tools/player_x11/gles_video_renderer.cc index 104de5f..8bd8b3e 100644 --- a/media/tools/player_x11/gles_video_renderer.cc +++ b/media/tools/player_x11/gles_video_renderer.cc @@ -364,7 +364,7 @@ void GlesVideoRenderer::CreateShader(GLuint program, glGetShaderiv(shader, GL_COMPILE_STATUS, &result); if (!result) { char log[kErrorSize]; - int len = 0; + int len; glGetShaderInfoLog(shader, kErrorSize - 1, &len, log); log[kErrorSize - 1] = 0; LOG(FATAL) << log; @@ -379,7 +379,7 @@ void GlesVideoRenderer::LinkProgram(GLuint program) { glGetProgramiv(program, GL_LINK_STATUS, &result); if (!result) { char log[kErrorSize]; - int len = 0; + int len; glGetProgramInfoLog(program, kErrorSize - 1, &len, log); log[kErrorSize - 1] = 0; LOG(FATAL) << log; |