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

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h

Issue 1435183002: WebGL 2: fix the bug in invalidate-framebuffer.html (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Ken's feedback Created 5 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
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 #ifndef WebGL2RenderingContextBase_h 5 #ifndef WebGL2RenderingContextBase_h
6 #define WebGL2RenderingContextBase_h 6 #define WebGL2RenderingContextBase_h
7 7
8 #include "modules/webgl/WebGLExtension.h" 8 #include "modules/webgl/WebGLExtension.h"
9 #include "modules/webgl/WebGLRenderingContextBase.h" 9 #include "modules/webgl/WebGLRenderingContextBase.h"
10 10
(...skipping 18 matching lines...) Expand all
29 29
30 /* Buffer objects */ 30 /* Buffer objects */
31 void copyBufferSubData(GLenum, GLenum, long long, long long, long long); 31 void copyBufferSubData(GLenum, GLenum, long long, long long, long long);
32 void getBufferSubData(GLenum target, long long offset, DOMArrayBuffer* retur nedData); 32 void getBufferSubData(GLenum target, long long offset, DOMArrayBuffer* retur nedData);
33 33
34 /* Framebuffer objects */ 34 /* Framebuffer objects */
35 bool validateTexFuncLayer(const char*, GLenum texTarget, GLint layer); 35 bool validateTexFuncLayer(const char*, GLenum texTarget, GLint layer);
36 void blitFramebuffer(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); 36 void blitFramebuffer(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
37 void framebufferTextureLayer(ScriptState*, GLenum, GLenum, WebGLTexture*, GL int, GLint); 37 void framebufferTextureLayer(ScriptState*, GLenum, GLenum, WebGLTexture*, GL int, GLint);
38 ScriptValue getInternalformatParameter(ScriptState*, GLenum, GLenum, GLenum) ; 38 ScriptValue getInternalformatParameter(ScriptState*, GLenum, GLenum, GLenum) ;
39 void invalidateFramebuffer(GLenum, Vector<GLenum>&); 39 void invalidateFramebuffer(GLenum, const Vector<GLenum>&);
40 void invalidateSubFramebuffer(GLenum, Vector<GLenum>&, GLint, GLint, GLsizei , GLsizei); 40 void invalidateSubFramebuffer(GLenum, const Vector<GLenum>&, GLint, GLint, G Lsizei, GLsizei);
41 void readBuffer(GLenum); 41 void readBuffer(GLenum);
42 42
43 /* Renderbuffer objects */ 43 /* Renderbuffer objects */
44 void renderbufferStorageMultisample(GLenum, GLsizei, GLenum, GLsizei, GLsize i); 44 void renderbufferStorageMultisample(GLenum, GLsizei, GLenum, GLsizei, GLsize i);
45 45
46 /* Texture objects */ 46 /* Texture objects */
47 void texStorage2D(GLenum, GLsizei, GLenum, GLsizei, GLsizei); 47 void texStorage2D(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
48 void texStorage3D(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei); 48 void texStorage3D(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
49 void texImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLen um, GLenum, DOMArrayBufferView*); 49 void texImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLen um, GLenum, DOMArrayBufferView*);
50 void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLs izei, GLenum, GLenum, DOMArrayBufferView*); 50 void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLs izei, GLenum, GLenum, DOMArrayBufferView*);
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 bool isBufferBoundToTransformFeedback(WebGLBuffer*); 206 bool isBufferBoundToTransformFeedback(WebGLBuffer*);
207 bool isBufferBoundToNonTransformFeedback(WebGLBuffer*); 207 bool isBufferBoundToNonTransformFeedback(WebGLBuffer*);
208 bool validateBufferTargetCompatibility(const char*, GLenum, WebGLBuffer*); 208 bool validateBufferTargetCompatibility(const char*, GLenum, WebGLBuffer*);
209 209
210 bool validateBufferBaseTarget(const char* functionName, GLenum target); 210 bool validateBufferBaseTarget(const char* functionName, GLenum target);
211 bool validateAndUpdateBufferBindBaseTarget(const char* functionName, GLenum, GLuint, WebGLBuffer*); 211 bool validateAndUpdateBufferBindBaseTarget(const char* functionName, GLenum, GLuint, WebGLBuffer*);
212 212
213 void vertexAttribIivImpl(const char*, GLuint, const GLint*, GLsizei); 213 void vertexAttribIivImpl(const char*, GLuint, const GLint*, GLsizei);
214 void vertexAttribIuivImpl(const char*, GLuint, const GLuint*, GLsizei); 214 void vertexAttribIuivImpl(const char*, GLuint, const GLuint*, GLsizei);
215 215
216 bool checkAndTranslateAttachments(const char* functionName, GLenum, const Ve ctor<GLenum>&, Vector<GLenum>&);
217
216 /* WebGLRenderingContextBase overrides */ 218 /* WebGLRenderingContextBase overrides */
217 unsigned getMaxWebGLLocationLength() const override { return 1024; }; 219 unsigned getMaxWebGLLocationLength() const override { return 1024; };
218 bool validateCapability(const char* functionName, GLenum) override; 220 bool validateCapability(const char* functionName, GLenum) override;
219 bool validateBufferTarget(const char* functionName, GLenum target) override; 221 bool validateBufferTarget(const char* functionName, GLenum target) override;
220 bool validateAndUpdateBufferBindTarget(const char* functionName, GLenum, Web GLBuffer*) override; 222 bool validateAndUpdateBufferBindTarget(const char* functionName, GLenum, Web GLBuffer*) override;
221 WebGLTexture* validateTextureBinding(const char* functionName, GLenum target , bool useSixEnumsForCubeMap) override; 223 WebGLTexture* validateTextureBinding(const char* functionName, GLenum target , bool useSixEnumsForCubeMap) override;
222 bool validateFramebufferTarget(GLenum target) override; 224 bool validateFramebufferTarget(GLenum target) override;
223 bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override; 225 bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override;
224 DOMArrayBufferView::ViewType readPixelsExpectedArrayBufferViewType(GLenum ty pe) override; 226 DOMArrayBufferView::ViewType readPixelsExpectedArrayBufferViewType(GLenum ty pe) override;
225 WebGLFramebuffer* getFramebufferBinding(GLenum target) override; 227 WebGLFramebuffer* getFramebufferBinding(GLenum target) override;
(...skipping 28 matching lines...) Expand all
254 PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits; 256 PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
255 }; 257 };
256 258
257 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context, 259 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
258 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2, 260 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2,
259 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2) ; 261 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2) ;
260 262
261 } // namespace blink 263 } // namespace blink
262 264
263 #endif 265 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698