Better state tracking and validation for bindBufferBase and bindBufferRange

Source/modules/webgl/WebGL2RenderingContextBase.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebGL2RenderingContextBase_h
 #define WebGL2RenderingContextBase_h
 
 #include "modules/webgl/WebGLExtension.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 
@@ skipping 177 matching lines @@
         TexStorageType3D,
     };
     bool validateTexStorage(const char*, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, TexStorageType);
     bool validateTexSubImage3D(const char*, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLenum format, GLenum type, GLsizei width, GLsizei height, GLsizei depth);
 
     ScriptValue getInt64Parameter(ScriptState*, GLenum);
 
     void texSubImage3DImpl(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, Image*, WebGLImageConversion::ImageHtmlDomSource, bool, bool);
     void samplerParameter(WebGLSampler*, GLenum, GLfloat, GLint, bool);
 
+    bool isBufferBoundToTransformFeedback(WebGLBuffer*);
+    bool isBufferBoundToNonTransformFeedback(WebGLBuffer*);
+    bool validateBufferTargetCompatiblity(const char*, GLenum, WebGLBuffer*);

[Ken Russell (switch to Gerrit), 2015/09/04 20:51:32]

typo: Compatiblity -> Compatibility

+
+    bool validateBufferBaseTarget(const char* functionName, GLenum target);
+    bool validateAndUpdateBufferBindBaseTarget(const char* functionName, GLenum, GLuint, WebGLBuffer*);
+
     /* WebGLRenderingContextBase overrides */
     unsigned getMaxWebGLLocationLength() const override { return 1024; };
     bool validateCapability(const char* functionName, GLenum) override;
     bool validateBufferTarget(const char* functionName, GLenum target) override;
     bool validateAndUpdateBufferBindTarget(const char* functionName, GLenum, WebGLBuffer*) override;
     WebGLTexture* validateTextureBinding(const char* functionName, GLenum target, bool useSixEnumsForCubeMap) override;
     bool validateFramebufferTarget(GLenum target) override;
     bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override;
     DOMArrayBufferView::ViewType readPixelsExpectedArrayBufferViewType(GLenum type) override;
     WebGLFramebuffer* getFramebufferBinding(GLenum target) override;
@@ skipping 11 matching lines @@
     GLint m_max3DTextureSize;
     GLint m_max3DTextureLevel;
 
     PersistentWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
     PersistentWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
     PersistentWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
     PersistentWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
     PersistentWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
     PersistentWillBeMember<WebGLBuffer> m_boundUniformBuffer;
 
+    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedTransformFeedbackBuffers;
+    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedUniformBuffers;
+
     PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
     PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
     PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
 };
 
 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
     context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2,
     context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2);
 
 } // namespace blink
 
 #endif