Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc

Issue 5305005: Initialize destinations variables before calling GL functions... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/gpu/gpu_info_collector_mac.mm ('k') | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(ENABLE_GPU) 5 #if defined(ENABLE_GPU)
6 6
7 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" 7 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
8 8
9 #include <GLES2/gl2.h> 9 #include <GLES2/gl2.h>
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog( 686 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog(
687 WebGLId program) { 687 WebGLId program) {
688 makeContextCurrent(); 688 makeContextCurrent();
689 GLint logLength = 0; 689 GLint logLength = 0;
690 glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); 690 glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
691 if (!logLength) 691 if (!logLength)
692 return WebKit::WebString(); 692 return WebKit::WebString();
693 scoped_array<GLchar> log(new GLchar[logLength]); 693 scoped_array<GLchar> log(new GLchar[logLength]);
694 if (!log.get()) 694 if (!log.get())
695 return WebKit::WebString(); 695 return WebKit::WebString();
696 GLsizei returnedLogLength; 696 GLsizei returnedLogLength = 0;
697 glGetProgramInfoLog(program, logLength, &returnedLogLength, log.get()); 697 glGetProgramInfoLog(program, logLength, &returnedLogLength, log.get());
698 DCHECK_EQ(logLength, returnedLogLength + 1); 698 DCHECK_EQ(logLength, returnedLogLength + 1);
699 WebKit::WebString res = 699 WebKit::WebString res =
700 WebKit::WebString::fromUTF8(log.get(), returnedLogLength); 700 WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
701 return res; 701 return res;
702 } 702 }
703 703
704 DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv, 704 DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv,
705 unsigned long, unsigned long, int*) 705 unsigned long, unsigned long, int*)
706 706
707 DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, unsigned long, int*) 707 DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, unsigned long, int*)
708 708
709 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog( 709 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog(
710 WebGLId shader) { 710 WebGLId shader) {
711 makeContextCurrent(); 711 makeContextCurrent();
712 GLint logLength = 0; 712 GLint logLength = 0;
713 glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength); 713 glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
714 if (!logLength) 714 if (!logLength)
715 return WebKit::WebString(); 715 return WebKit::WebString();
716 scoped_array<GLchar> log(new GLchar[logLength]); 716 scoped_array<GLchar> log(new GLchar[logLength]);
717 if (!log.get()) 717 if (!log.get())
718 return WebKit::WebString(); 718 return WebKit::WebString();
719 GLsizei returnedLogLength; 719 GLsizei returnedLogLength = 0;
720 glGetShaderInfoLog(shader, logLength, &returnedLogLength, log.get()); 720 glGetShaderInfoLog(shader, logLength, &returnedLogLength, log.get());
721 DCHECK_EQ(logLength, returnedLogLength + 1); 721 DCHECK_EQ(logLength, returnedLogLength + 1);
722 WebKit::WebString res = 722 WebKit::WebString res =
723 WebKit::WebString::fromUTF8(log.get(), returnedLogLength); 723 WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
724 return res; 724 return res;
725 } 725 }
726 726
727 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource( 727 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource(
728 WebGLId shader) { 728 WebGLId shader) {
729 makeContextCurrent(); 729 makeContextCurrent();
730 GLint logLength = 0; 730 GLint logLength = 0;
731 glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength); 731 glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength);
732 if (!logLength) 732 if (!logLength)
733 return WebKit::WebString(); 733 return WebKit::WebString();
734 scoped_array<GLchar> log(new GLchar[logLength]); 734 scoped_array<GLchar> log(new GLchar[logLength]);
735 if (!log.get()) 735 if (!log.get())
736 return WebKit::WebString(); 736 return WebKit::WebString();
737 GLsizei returnedLogLength; 737 GLsizei returnedLogLength = 0;
738 glGetShaderSource(shader, logLength, &returnedLogLength, log.get()); 738 glGetShaderSource(shader, logLength, &returnedLogLength, log.get());
739 DCHECK_EQ(logLength, returnedLogLength + 1); 739 DCHECK_EQ(logLength, returnedLogLength + 1);
740 WebKit::WebString res = 740 WebKit::WebString res =
741 WebKit::WebString::fromUTF8(log.get(), returnedLogLength); 741 WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
742 return res; 742 return res;
743 } 743 }
744 744
745 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getString( 745 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getString(
746 unsigned long name) { 746 unsigned long name) {
747 makeContextCurrent(); 747 makeContextCurrent();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 } 1007 }
1008 1008
1009 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor( 1009 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor(
1010 unsigned texture, unsigned parentTexture) { 1010 unsigned texture, unsigned parentTexture) {
1011 makeContextCurrent(); 1011 makeContextCurrent();
1012 glCopyTextureToParentTextureCHROMIUM(texture, parentTexture); 1012 glCopyTextureToParentTextureCHROMIUM(texture, parentTexture);
1013 glFlush(); 1013 glFlush();
1014 } 1014 }
1015 1015
1016 #endif // defined(ENABLE_GPU) 1016 #endif // defined(ENABLE_GPU)
OLDNEW
« no previous file with comments | « chrome/gpu/gpu_info_collector_mac.mm ('k') | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698