Mesa (master): mesa: simplify/improve some _mesa_error() calls in teximage.c

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Dec  5 09:27:52 2017 -0700

mesa: simplify/improve some _mesa_error() calls in teximage.c

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/teximage.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 41de966d79..572e380872 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5778,14 +5778,10 @@ texture_image_multisample(struct gl_context *ctx, GLuint dims,
    }
 
    if (!check_multisample_target(dims, target, dsa)) {
-      if (dsa) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "%s(target)", func);
-         return;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);
-         return;
-      }
+      GLenum err = dsa ? GL_INVALID_OPERATION : GL_INVALID_ENUM;
+      _mesa_error(ctx, err, "%s(target=%s)", func,
+                  _mesa_enum_to_string(target));
+      return;
    }
 
    /* check that the specified internalformat is color/depth/stencil-renderable;
@@ -5826,7 +5822,7 @@ texture_image_multisample(struct gl_context *ctx, GLuint dims,
     *    However, if samples is not supported, then no error is generated.
     */
    if (!samplesOK && !_mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, sample_count_error, "%s(samples)", func);
+      _mesa_error(ctx, sample_count_error, "%s(samples=%d)", func, samples);
       return;
    }