From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Jun 2009 18:12:54 +0000 (-0600)
Subject: st/mesa: no longer special-case buffer object 0 in st_buffer_object() cast wrapper
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ffd074436949f3958127cc5ae7c7c9e9e9e0bf8;p=profile%2Fivi%2Fmesa.git

st/mesa: no longer special-case buffer object 0 in st_buffer_object() cast wrapper

Since commit 6629a35559ff7e3b993966f697f7c7f68e5a38d9 "mesa: create/destroy
buffer objects via driver functions" this is no longer needed, and actually
was causing a crash during context tear-down.
---

diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.h b/src/mesa/state_tracker/st_cb_bufferobjects.h
index dcbb5a5..0adda5d 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.h
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.h
@@ -44,18 +44,11 @@ struct st_buffer_object
 };
 
 
-/* Are the obj->Name tests necessary?  Unfortunately yes, mesa
- * allocates a couple of gl_buffer_object structs statically, and the
- * Name == 0 test is the only way to identify them and avoid casting
- * them erroneously to our structs.
- */
+/** cast wrapper */
 static INLINE struct st_buffer_object *
 st_buffer_object(struct gl_buffer_object *obj)
 {
-   if (obj->Name)
-      return (struct st_buffer_object *) obj;
-   else
-      return NULL;
+   return (struct st_buffer_object *) obj;
 }