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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

Issue 1379863003: Added overloads of uniform[1234]uiv taking Uint32Array to match spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
index 9d861b8269d8da494f67ae05d9b9f58e610da725..bcbc3778456597d298a4ae1fee1da41c0e2f24ae 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
@@ -594,7 +594,7 @@ protected:
public:
LRUImageBufferCache(int capacity);
// The pointer returned is owned by the image buffer map.
- ImageBuffer* imageBuffer(const IntSize& size);
Ken Russell (switch to Gerrit) 2015/09/30 21:43:37 This change was required to pass the presubmit che
+ ImageBuffer* imageBuffer(const IntSize&);
private:
void bubbleToFront(int idx);
OwnPtr<OwnPtr<ImageBuffer>[]> m_buffers;
@@ -1003,7 +1003,14 @@ protected:
bool validateUniformMatrixParameters(const char* functionName, const WebGLUniformLocation*, GLboolean transpose, void*, GLsizei, GLsizei mod);
template<typename WTFTypedArray>
- bool validateUniformParameters(const char*, const WebGLUniformLocation*, const TypedFlexibleArrayBufferView<WTFTypedArray>&, GLsizei);
+ bool validateUniformParameters(const char* functionName, const WebGLUniformLocation* location, const TypedFlexibleArrayBufferView<WTFTypedArray>& v, GLsizei requiredMinSize)
+ {
+ if (!v.dataMaybeOnStack()) {
+ synthesizeGLError(GL_INVALID_VALUE, functionName, "no array");
+ return false;
+ }
+ return validateUniformMatrixParameters(functionName, location, false, v.dataMaybeOnStack(), v.length(), requiredMinSize);
+ }
// Helper function to validate the target for bufferData and getBufferParameter.
virtual bool validateBufferTarget(const char* functionName, GLenum target);
@@ -1043,7 +1050,7 @@ protected:
// Helper functions to bufferData() and bufferSubData().
void bufferDataImpl(GLenum target, long long size, const void* data, GLenum usage);
- void bufferSubDataImpl(GLenum target, long long offset, GLsizeiptr size, const void* data);
Ken Russell (switch to Gerrit) 2015/09/30 21:43:37 This one too.
+ void bufferSubDataImpl(GLenum target, long long offset, GLsizeiptr, const void* data);
// Helper function for delete* (deleteBuffer, deleteProgram, etc) functions.
// Return false if caller should return without further processing.

Powered by Google App Engine
This is Rietveld 408576698