Improve samplerParameter[if] in WebGL2

Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // 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.
 
 #include "config.h"
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 1276 matching lines @@
 {
     if (isContextLost())
         return nullptr;
     WebGLSampler* o = WebGLSampler::create(this);
     addSharedObject(o);
     return o;
 }
 
 void WebGL2RenderingContextBase::deleteSampler(WebGLSampler* sampler)
 {
+    if (isContextLost())
+        return;
+
     for (size_t i = 0; i < m_samplerUnits.size(); ++i) {
         if (sampler == m_samplerUnits[i]) {
             m_samplerUnits[i] = nullptr;
             webContext()->bindSampler(i, 0);
         }
     }
 
     deleteObject(sampler);
 }
 
 GLboolean WebGL2RenderingContextBase::isSampler(WebGLSampler* sampler)
 {
     if (isContextLost() || !sampler)
         return 0;
 
     return webContext()->isSampler(sampler->object());
 }
 
 void WebGL2RenderingContextBase::bindSampler(GLuint unit, WebGLSampler* sampler)
 {
+    if (isContextLost())
+        return;
+
     bool deleted;
     if (!checkObjectToBeBound("bindSampler", sampler, deleted))
         return;
     if (deleted) {
         synthesizeGLError(GL_INVALID_OPERATION, "bindSampler", "attempted to bind a deleted sampler");
         return;
     }
 
     if (unit >= m_samplerUnits.size()) {
         synthesizeGLError(GL_INVALID_VALUE, "bindSampler", "texture unit out of range");
         return;
     }
 
     m_samplerUnits[unit] = sampler;
 
     webContext()->bindSampler(unit, objectOrZero(sampler));
 }
 
+void WebGL2RenderingContextBase::samplerParameter(WebGLSampler* sampler, GLenum pname, GLfloat paramf, GLint parami, bool isFloat)
+{
+    if (isContextLost() || !validateWebGLObject("samplerParameter", sampler))
+        return;
+
+    switch (pname) {
+    case GL_TEXTURE_COMPARE_FUNC:
+    case GL_TEXTURE_COMPARE_MODE:
+    case GL_TEXTURE_MAG_FILTER:
+    case GL_TEXTURE_MIN_FILTER:
+    case GL_TEXTURE_WRAP_R:
+    case GL_TEXTURE_WRAP_S:
+    case GL_TEXTURE_WRAP_T:
+    case GL_TEXTURE_MAX_LOD:
+    case GL_TEXTURE_MIN_LOD:
+        break;
+    default:
+        synthesizeGLError(GL_INVALID_ENUM, "samplerParameter", "invalid parameter name");
+        return;
+    }
+
+    if (isFloat) {
+        webContext()->samplerParameterf(objectOrZero(sampler), pname, paramf);
+    } else {
+        webContext()->samplerParameteri(objectOrZero(sampler), pname, parami);
+    }
+}
+
 void WebGL2RenderingContextBase::samplerParameteri(WebGLSampler* sampler, GLenum pname, GLint param)
 {
-    if (isContextLost() || !validateWebGLObject("samplerParameteri", sampler))
-        return;
-
-    webContext()->samplerParameteri(objectOrZero(sampler), pname, param);
+    samplerParameter(sampler, pname, 0, param, false);
 }
 
 void WebGL2RenderingContextBase::samplerParameterf(WebGLSampler* sampler, GLenum pname, GLfloat param)
 {
-    if (isContextLost() || !validateWebGLObject("samplerParameterf", sampler))
-        return;
-
-    webContext()->samplerParameterf(objectOrZero(sampler), pname, param);
+    samplerParameter(sampler, pname, param, 0, true);
 }
 
 ScriptValue WebGL2RenderingContextBase::getSamplerParameter(ScriptState* scriptState, WebGLSampler* sampler, GLenum pname)
 {
     if (isContextLost() || !validateWebGLObject("getSamplerParameter", sampler))
         return ScriptValue::createNull(scriptState);
 
     switch (pname) {
     case GL_TEXTURE_COMPARE_FUNC:
     case GL_TEXTURE_COMPARE_MODE:
@@ skipping 1084 matching lines @@
 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
 {
     if (m_readFramebufferBinding && m_readFramebufferBinding->object())
         return m_readFramebufferBinding->colorBufferFormat();
     if (m_requestedAttributes.alpha())
         return GL_RGBA;
     return GL_RGB;
 }
 
 } // namespace blink