Mesa (master): mesa: use _mesa_lookup_texture_err() in get_tex_obj_for_clear()

Samuel Pitoiset hakzsam at kemper.freedesktop.org
Thu Jun 22 08:46:19 UTC 2017


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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Jun 21 10:09:47 2017 +0200

mesa: use _mesa_lookup_texture_err() in get_tex_obj_for_clear()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/main/teximage.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 54f7c08d50..346d505fca 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4143,17 +4143,9 @@ get_tex_obj_for_clear(struct gl_context *ctx,
 {
    struct gl_texture_object *texObj;
 
-   if (texture == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(zero texture)", function);
-      return NULL;
-   }
-
-   texObj = _mesa_lookup_texture(ctx, texture);
-
-   if (texObj == NULL) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", function);
+   texObj = _mesa_lookup_texture_err(ctx, texture, function);
+   if (!texObj)
       return NULL;
-   }
 
    if (texObj->Target == 0) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "%s(unbound tex)", function);




More information about the mesa-commit mailing list