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

Side by Side Diff: Source/modules/webgl/WebGL2RenderingContextBase.cpp

Issue 1329763004: Oilpan: Build fix after r201851 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "config.h" 5 #include "config.h"
6 #include "modules/webgl/WebGL2RenderingContextBase.h" 6 #include "modules/webgl/WebGL2RenderingContextBase.h"
7 7
8 #include "bindings/modules/v8/WebGLAny.h" 8 #include "bindings/modules/v8/WebGLAny.h"
9 #include "core/html/HTMLCanvasElement.h" 9 #include "core/html/HTMLCanvasElement.h"
10 #include "core/html/HTMLImageElement.h" 10 #include "core/html/HTMLImageElement.h"
(...skipping 2565 matching lines...) Expand 10 before | Expand all | Expand 10 after
2576 DEFINE_TRACE(WebGL2RenderingContextBase) 2576 DEFINE_TRACE(WebGL2RenderingContextBase)
2577 { 2577 {
2578 visitor->trace(m_readFramebufferBinding); 2578 visitor->trace(m_readFramebufferBinding);
2579 visitor->trace(m_transformFeedbackBinding); 2579 visitor->trace(m_transformFeedbackBinding);
2580 visitor->trace(m_boundCopyReadBuffer); 2580 visitor->trace(m_boundCopyReadBuffer);
2581 visitor->trace(m_boundCopyWriteBuffer); 2581 visitor->trace(m_boundCopyWriteBuffer);
2582 visitor->trace(m_boundPixelPackBuffer); 2582 visitor->trace(m_boundPixelPackBuffer);
2583 visitor->trace(m_boundPixelUnpackBuffer); 2583 visitor->trace(m_boundPixelUnpackBuffer);
2584 visitor->trace(m_boundTransformFeedbackBuffer); 2584 visitor->trace(m_boundTransformFeedbackBuffer);
2585 visitor->trace(m_boundUniformBuffer); 2585 visitor->trace(m_boundUniformBuffer);
2586 visitor->trace(m_boundIndexedTransformFeedbackBuffers);
2587 visitor->trace(m_boundIndexedUniformBuffers);
2586 visitor->trace(m_currentBooleanOcclusionQuery); 2588 visitor->trace(m_currentBooleanOcclusionQuery);
2587 visitor->trace(m_currentTransformFeedbackPrimitivesWrittenQuery); 2589 visitor->trace(m_currentTransformFeedbackPrimitivesWrittenQuery);
2588 visitor->trace(m_samplerUnits); 2590 visitor->trace(m_samplerUnits);
2589 WebGLRenderingContextBase::trace(visitor); 2591 WebGLRenderingContextBase::trace(visitor);
2590 } 2592 }
2591 2593
2592 WebGLTexture* WebGL2RenderingContextBase::validateTextureBinding(const char* fun ctionName, GLenum target, bool useSixEnumsForCubeMap) 2594 WebGLTexture* WebGL2RenderingContextBase::validateTextureBinding(const char* fun ctionName, GLenum target, bool useSixEnumsForCubeMap)
2593 { 2595 {
2594 WebGLTexture* tex = nullptr; 2596 WebGLTexture* tex = nullptr;
2595 switch (target) { 2597 switch (target) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
2741 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat() 2743 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
2742 { 2744 {
2743 if (m_readFramebufferBinding && m_readFramebufferBinding->object()) 2745 if (m_readFramebufferBinding && m_readFramebufferBinding->object())
2744 return m_readFramebufferBinding->colorBufferFormat(); 2746 return m_readFramebufferBinding->colorBufferFormat();
2745 if (m_requestedAttributes.alpha()) 2747 if (m_requestedAttributes.alpha())
2746 return GL_RGBA; 2748 return GL_RGBA;
2747 return GL_RGB; 2749 return GL_RGB;
2748 } 2750 }
2749 2751
2750 } // namespace blink 2752 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698