Mesa (master): mesa: use _mesa_is_bufferobj() helper in _mesa_vertex_attrib_address()
Brian Paul
brianp at kemper.freedesktop.org
Tue Nov 12 18:57:26 UTC 2013
Module: Mesa
Branch: master
Commit: 5f22f3207e298f53aaf8c965a39f758578a28600
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f22f3207e298f53aaf8c965a39f758578a28600
Author: Brian Paul <brianp at vmware.com>
Date: Mon Nov 11 10:57:23 2013 -0700
mesa: use _mesa_is_bufferobj() helper in _mesa_vertex_attrib_address()
And use a regular if statment to slightly improve readability.
Jordan Justen <jordan.l.justen at intel.com>
---
src/mesa/main/varray.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index ecfc6b6..3b9f39a 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -76,9 +76,10 @@ static inline const GLubyte *
_mesa_vertex_attrib_address(const struct gl_vertex_attrib_array *array,
const struct gl_vertex_buffer_binding *binding)
{
- return (binding->BufferObj->Name == 0 ?
- array->Ptr :
- (const GLubyte *)(binding->Offset + array->RelativeOffset));
+ if (_mesa_is_bufferobj(binding->BufferObj))
+ return (const GLubyte *) (binding->Offset + array->RelativeOffset);
+ else
+ return array->Ptr;
}
/**
More information about the mesa-commit
mailing list