Mesa (master): mesa: don't error check the default buffer object

[Timothy Arceri]

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

Author: Timothy Arceri <tarc...@itsqueeze.com>
Date:   Wed Jul 26 11:11:02 2017 +1000

mesa: don't error check the default buffer object

An allocation check is already done when the buffer is created at
context creation.

Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>

---

 src/mesa/main/bufferobj.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 625fd5f342..cff1905e16 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -4274,6 +4274,12 @@ bind_buffer_range(GLenum target, GLuint index, GLuint 
buffer, GLintptr offset,
       if (!_mesa_handle_bind_buffer_gen(ctx, buffer,
                                         &bufObj, "glBindBufferRange"))
          return;
+
+      if (!no_error && !bufObj) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glBindBufferRange(invalid buffer=%u)", buffer);
+         return;
+      }
    }
 
    if (no_error) {
@@ -4296,12 +4302,6 @@ bind_buffer_range(GLenum target, GLuint index, GLuint 
buffer, GLintptr offset,
          unreachable("invalid BindBufferRange target with KHR_no_error");
       }
    } else {
-      if (!bufObj) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glBindBufferRange(invalid buffer=%u)", buffer);
-         return;
-      }
-
       if (buffer != 0) {
          if (size <= 0) {
             _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size=%d)",
@@ -4372,12 +4372,12 @@ _mesa_BindBufferBase(GLenum target, GLuint index, 
GLuint buffer)
       if (!_mesa_handle_bind_buffer_gen(ctx, buffer,
                                         &bufObj, "glBindBufferBase"))
          return;
-   }
 
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferBase(invalid buffer=%u)", buffer);
-      return;
+      if (!bufObj) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glBindBufferBase(invalid buffer=%u)", buffer);
+         return;
+      }
    }
 
    /* Note that there's some oddness in the GL 3.1-GL 3.3 specifications with

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit