glthread: handle buffer unbinding via glDeleteBuffers

[mesa.git] / src / mesa / main / glthread_marshal.h

diff --git a/src/mesa/main/glthread_marshal.h b/src/mesa/main/glthread_marshal.h
index e3781b0437fe909a2929badcaf7685bf45389521..3adabb217bb10cb19e380bf2c7ea3d78a403f788 100644 (file)
--- a/src/mesa/main/glthread_marshal.h
+++ b/src/mesa/main/glthread_marshal.h
@@ -81,10 +81,10 @@ static inline bool
 _mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
+   struct glthread_vao *vao = glthread->CurrentVAO;
 
    return ctx->API != API_OPENGL_CORE &&
-          (glthread->CurrentVAO->IndexBufferIsUserPointer ||
-           glthread->CurrentVAO->HasUserPointer);
+          (vao->CurrentElementBufferName == 0 || vao->HasUserPointer);
 }
 
 static inline bool
@@ -101,28 +101,25 @@ _mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
    const struct glthread_state *glthread = &ctx->GLThread;
 
    return ctx->API != API_OPENGL_CORE &&
-          (!glthread->draw_indirect_buffer_is_vbo ||
-           glthread->CurrentVAO->HasUserPointer );
+          (glthread->CurrentDrawIndirectBufferName == 0 ||
+           glthread->CurrentVAO->HasUserPointer);
 }
 
 static inline bool
 _mesa_glthread_is_non_vbo_draw_elements_indirect(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
+   struct glthread_vao *vao = glthread->CurrentVAO;
 
    return ctx->API != API_OPENGL_CORE &&
-          (!glthread->draw_indirect_buffer_is_vbo ||
-           glthread->CurrentVAO->IndexBufferIsUserPointer ||
-           glthread->CurrentVAO->HasUserPointer);
+          (glthread->CurrentDrawIndirectBufferName == 0 ||
+           vao->CurrentElementBufferName == 0 || vao->HasUserPointer);
 }
 
 
 struct _glapi_table *
 _mesa_create_marshal_table(const struct gl_context *ctx);
 
-void
-_mesa_glthread_BindBuffer(struct gl_context *ctx, GLenum target, GLuint buffer);
-
 static inline unsigned
 _mesa_buffer_enum_to_count(GLenum buffer)
 {