Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (194218 => 194219)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-12-17 13:25:08 UTC (rev 194218)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-12-17 17:58:11 UTC (rev 194219)
@@ -820,9 +820,8 @@
return 0;
}
-void WebGLRenderingContextBase::activeTexture(GC3Denum texture, ExceptionCode& ec)
+void WebGLRenderingContextBase::activeTexture(GC3Denum texture, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
if (texture - GraphicsContext3D::TEXTURE0 >= m_textureUnits.size()) {
@@ -833,9 +832,8 @@
m_context->activeTexture(texture);
}
-void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode& ec)
+void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("attachShader", program) || !validateWebGLObject("attachShader", shader))
return;
if (!program->attachShader(shader)) {
@@ -846,9 +844,8 @@
shader->onAttached();
}
-void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name, ExceptionCode& ec)
+void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("bindAttribLocation", program))
return;
if (!validateLocationLength("bindAttribLocation", name))
@@ -881,9 +878,8 @@
return true;
}
-void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer, ExceptionCode& ec)
+void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer, ExceptionCode&)
{
- UNUSED_PARAM(ec);
bool deleted;
if (!checkObjectToBeBound("bindBuffer", buffer, deleted))
return;
@@ -907,9 +903,8 @@
buffer->setTarget(target);
}
-void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer, ExceptionCode& ec)
+void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer, ExceptionCode&)
{
- UNUSED_PARAM(ec);
bool deleted;
if (!checkObjectToBeBound("bindFramebuffer", buffer, deleted))
return;
@@ -926,9 +921,8 @@
applyStencilTest();
}
-void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer, ExceptionCode& ec)
+void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer, ExceptionCode&)
{
- UNUSED_PARAM(ec);
bool deleted;
if (!checkObjectToBeBound("bindRenderbuffer", renderBuffer, deleted))
return;
@@ -944,9 +938,8 @@
renderBuffer->setHasEverBeenBound();
}
-void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture, ExceptionCode& ec)
+void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture, ExceptionCode&)
{
- UNUSED_PARAM(ec);
bool deleted;
if (!checkObjectToBeBound("bindTexture", texture, deleted))
return;
@@ -1018,9 +1011,8 @@
m_context->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode& ec)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
@@ -1049,9 +1041,8 @@
}
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode& ec)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
@@ -1076,9 +1067,8 @@
}
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBufferView* data, GC3Denum usage, ExceptionCode& ec)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBufferView* data, GC3Denum usage, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
@@ -1103,9 +1093,8 @@
}
}
-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode& ec)
+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
WebGLBuffer* buffer = validateBufferDataParameters("bufferSubData", target, GraphicsContext3D::STATIC_DRAW);
@@ -1132,9 +1121,8 @@
}
}
-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBufferView* data, ExceptionCode& ec)
+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBufferView* data, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
WebGLBuffer* buffer = validateBufferDataParameters("bufferSubData", target, GraphicsContext3D::STATIC_DRAW);
@@ -1227,9 +1215,8 @@
m_context->colorMask(red, green, blue, alpha);
}
-void WebGLRenderingContextBase::compileShader(WebGLShader* shader, ExceptionCode& ec)
+void WebGLRenderingContextBase::compileShader(WebGLShader* shader, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("compileShader", shader))
return;
m_context->compileShader(objectOrZero(shader));
@@ -1431,9 +1418,8 @@
return o;
}
-PassRefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode& ec)
+PassRefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return nullptr;
if (type != GraphicsContext3D::VERTEX_SHADER && type != GraphicsContext3D::FRAGMENT_SHADER) {
@@ -1550,9 +1536,8 @@
m_context->depthRange(zNear, zFar);
}
-void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode& ec)
+void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("detachShader", program) || !validateWebGLObject("detachShader", shader))
return;
if (!program->detachShader(shader)) {
@@ -1577,9 +1562,8 @@
m_context->disable(cap);
}
-void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index, ExceptionCode& ec)
+void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
if (index >= m_maxVertexAttribs) {
@@ -1891,10 +1875,8 @@
return true;
}
-void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode& ec)
+void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode&)
{
- UNUSED_PARAM(ec);
-
if (!validateDrawArrays("drawArrays", mode, first, count, 0))
return;
@@ -1915,10 +1897,8 @@
markContextChanged();
}
-void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode& ec)
+void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode&)
{
- UNUSED_PARAM(ec);
-
unsigned numElements = 0;
if (!validateDrawElements("drawElements", mode, count, type, offset, numElements, 0))
return;
@@ -1957,9 +1937,8 @@
m_context->enable(cap);
}
-void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index, ExceptionCode& ec)
+void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
if (index >= m_maxVertexAttribs) {
@@ -1987,9 +1966,8 @@
m_context->flush();
}
-void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer, ExceptionCode& ec)
+void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferRenderbuffer", target, attachment))
return;
if (renderbuffertarget != GraphicsContext3D::RENDERBUFFER) {
@@ -2020,9 +1998,8 @@
applyStencilTest();
}
-void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level, ExceptionCode& ec)
+void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferTexture2D", target, attachment))
return;
if (level) {
@@ -2102,9 +2079,8 @@
tex->generateMipmapLevelInfo();
}
-PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode& ec)
+PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getActiveAttrib", program))
return nullptr;
ActiveInfo info;
@@ -2116,9 +2092,8 @@
return WebGLActiveInfo::create(info.name, info.type, info.size);
}
-PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode& ec)
+PassRefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getActiveUniform", program))
return 0;
ActiveInfo info;
@@ -2133,9 +2108,8 @@
return WebGLActiveInfo::create(info.name, info.type, info.size);
}
-bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects, ExceptionCode& ec)
+bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects, ExceptionCode&)
{
- UNUSED_PARAM(ec);
shaderObjects.clear();
if (isContextLostOrPending() || !validateWebGLObject("getAttachedShaders", program))
return false;
@@ -2169,9 +2143,8 @@
return m_context->getAttribLocation(objectOrZero(program), name);
}
-WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return WebGLGetInfo();
if (target != GraphicsContext3D::ARRAY_BUFFER && target != GraphicsContext3D::ELEMENT_ARRAY_BUFFER) {
@@ -2216,9 +2189,8 @@
return m_context->getError();
}
-WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getProgramParameter", program))
return WebGLGetInfo();
@@ -2244,17 +2216,15 @@
}
}
-String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program, ExceptionCode& ec)
+String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getProgramInfoLog", program))
return String();
return ensureNotNull(m_context->getProgramInfoLog(objectOrZero(program)));
}
-WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return WebGLGetInfo();
if (target != GraphicsContext3D::RENDERBUFFER) {
@@ -2318,9 +2288,8 @@
}
}
-WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getShaderParameter", shader))
return WebGLGetInfo();
GC3Dint value = 0;
@@ -2339,17 +2308,15 @@
}
}
-String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader, ExceptionCode& ec)
+String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getShaderInfoLog", shader))
return String();
return ensureNotNull(m_context->getShaderInfoLog(objectOrZero(shader)));
}
-PassRefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode& ec)
+PassRefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return nullptr;
switch (shaderType) {
@@ -2379,17 +2346,15 @@
return WebGLShaderPrecisionFormat::create(range[0], range[1], precision);
}
-String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader, ExceptionCode& ec)
+String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getShaderSource", shader))
return String();
return ensureNotNull(shader->getSource());
}
-WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return WebGLGetInfo();
WebGLTexture* tex = validateTextureBinding("getTexParameter", target, false);
@@ -2416,9 +2381,8 @@
}
}
-WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getUniform", program))
return WebGLGetInfo();
if (!uniformLocation || uniformLocation->program() != program) {
@@ -2544,9 +2508,8 @@
return WebGLGetInfo();
}
-PassRefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode& ec)
+PassRefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("getUniformLocation", program))
return nullptr;
if (!validateLocationLength("getUniformLocation", name))
@@ -2583,10 +2546,8 @@
return nullptr;
}
-WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode& ec)
+WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&)
{
- UNUSED_PARAM(ec);
-
if (isContextLostOrPending())
return WebGLGetInfo();
@@ -2732,9 +2693,8 @@
m_context->lineWidth(width);
}
-void WebGLRenderingContextBase::linkProgram(WebGLProgram* program, ExceptionCode& ec)
+void WebGLRenderingContextBase::linkProgram(WebGLProgram* program, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("linkProgram", program))
return;
WebGLShader* vertexShader = program->getAttachedShader(GraphicsContext3D::VERTEX_SHADER);
@@ -2905,9 +2865,8 @@
m_context->scissor(x, y, width, height);
}
-void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string, ExceptionCode& ec)
+void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("shaderSource", shader))
return;
String stringWithoutComments = StripComments(string).result();
@@ -3326,9 +3285,8 @@
texParameter(target, pname, 0, param, false);
}
-void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3340,27 +3298,24 @@
m_context->uniform1f(location->location(), x);
}
-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, 1))
return;
m_context->uniform1fv(location->location(), v->length(), v->data());
}
-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, size, 1))
return;
m_context->uniform1fv(location->location(), size, v);
}
-void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3377,9 +3332,8 @@
m_context->uniform1i(location->location(), x);
}
-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, 1))
return;
@@ -3395,9 +3349,8 @@
m_context->uniform1iv(location->location(), v->length(), v->data());
}
-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, size, 1))
return;
@@ -3412,9 +3365,8 @@
m_context->uniform1iv(location->location(), size, v);
}
-void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3426,27 +3378,24 @@
m_context->uniform2f(location->location(), x, y);
}
-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, 2))
return;
m_context->uniform2fv(location->location(), v->length() / 2, v->data());
}
-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, size, 2))
return;
m_context->uniform2fv(location->location(), size / 2, v);
}
-void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3458,27 +3407,24 @@
m_context->uniform2i(location->location(), x, y);
}
-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, 2))
return;
m_context->uniform2iv(location->location(), v->length() / 2, v->data());
}
-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, size, 2))
return;
m_context->uniform2iv(location->location(), size / 2, v);
}
-void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3490,27 +3436,24 @@
m_context->uniform3f(location->location(), x, y, z);
}
-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, 3))
return;
m_context->uniform3fv(location->location(), v->length() / 3, v->data());
}
-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, size, 3))
return;
m_context->uniform3fv(location->location(), size / 3, v);
}
-void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3522,27 +3465,24 @@
m_context->uniform3i(location->location(), x, y, z);
}
-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, 3))
return;
m_context->uniform3iv(location->location(), v->length() / 3, v->data());
}
-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, size, 3))
return;
m_context->uniform3iv(location->location(), size / 3, v);
}
-void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3554,27 +3494,24 @@
m_context->uniform4f(location->location(), x, y, z, w);
}
-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, 4))
return;
m_context->uniform4fv(location->location(), v->length() / 4, v->data());
}
-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, size, 4))
return;
m_context->uniform4fv(location->location(), size / 4, v);
}
-void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !location)
return;
@@ -3586,75 +3523,66 @@
m_context->uniform4i(location->location(), x, y, z, w);
}
-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, 4))
return;
m_context->uniform4iv(location->location(), v->length() / 4, v->data());
}
-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, size, 4))
return;
m_context->uniform4iv(location->location(), size / 4, v);
}
-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, 4))
return;
m_context->uniformMatrix2fv(location->location(), v->length() / 4, transpose, v->data());
}
-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, size, 4))
return;
m_context->uniformMatrix2fv(location->location(), size / 4, transpose, v);
}
-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, 9))
return;
m_context->uniformMatrix3fv(location->location(), v->length() / 9, transpose, v->data());
}
-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, size, 9))
return;
m_context->uniformMatrix3fv(location->location(), size / 9, transpose, v);
}
-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array* v, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, 16))
return;
m_context->uniformMatrix4fv(location->location(), v->length() / 16, transpose, v->data());
}
-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode& ec)
+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, size, 16))
return;
m_context->uniformMatrix4fv(location->location(), size / 16, transpose, v);
}
-void WebGLRenderingContextBase::useProgram(WebGLProgram* program, ExceptionCode& ec)
+void WebGLRenderingContextBase::useProgram(WebGLProgram* program, ExceptionCode&)
{
- UNUSED_PARAM(ec);
bool deleted;
if (!checkObjectToBeBound("useProgram", program, deleted))
return;
@@ -3674,9 +3602,8 @@
}
}
-void WebGLRenderingContextBase::validateProgram(WebGLProgram* program, ExceptionCode& ec)
+void WebGLRenderingContextBase::validateProgram(WebGLProgram* program, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending() || !validateWebGLObject("validateProgram", program))
return;
m_context->validateProgram(objectOrZero(program));
@@ -3742,9 +3669,8 @@
vertexAttribfvImpl("vertexAttrib4fv", index, v, size, 4);
}
-void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset, ExceptionCode& ec)
+void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset, ExceptionCode&)
{
- UNUSED_PARAM(ec);
if (isContextLostOrPending())
return;
switch (type) {
