Mesa (master): mesa: remove redundant error check

Timothy Arceri tarceri at kemper.freedesktop.org
Wed Jun 28 22:54:33 UTC 2017


Module: Mesa
Branch: master
Commit: 7d8937d23c618bf56f673bacbbfe0f1e4b632579
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d8937d23c618bf56f673bacbbfe0f1e4b632579

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue Jun 27 16:46:19 2017 +1000

mesa: remove redundant error check

We do the same check in the shared code in the set_tex_parameterf()
call.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/mesa/main/texparam.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 857faf6f3a..1059a4cb5e 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -962,10 +962,6 @@ _mesa_texture_parameteriv(struct gl_context *ctx,
    switch (pname) {
    case GL_TEXTURE_BORDER_COLOR:
       {
-         if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTextureParameteriv(texture)");
-            return;
-         }
          /* convert int params to float */
          GLfloat fparams[4];
          fparams[0] = INT_TO_FLOAT(params[0]);




More information about the mesa-commit mailing list