projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: implement per-buffer color masking
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_bufferobjects.h
diff --git
a/src/mesa/state_tracker/st_cb_bufferobjects.h
b/src/mesa/state_tracker/st_cb_bufferobjects.h
index dcbb5a52336a61a04d838812acf4a5714d46ac27..fda6d05dd3467118e9ba70f9058b5816e4060e29 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_bufferobjects.h
+++ b/
src/mesa/state_tracker/st_cb_bufferobjects.h
@@
-40,22
+40,14
@@
struct st_buffer_object
{
struct gl_buffer_object Base;
struct pipe_buffer *buffer;
{
struct gl_buffer_object Base;
struct pipe_buffer *buffer;
- GLsizeiptrARB size;
};
};
-/* 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)
{
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;
}
}