projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1098e69
)
vbo: minor clean-up in vbo_exec_api.c
author
Brian Paul
<brianp@vmware.com>
Fri, 14 Oct 2016 15:18:18 +0000
(09:18 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 20 Oct 2016 15:47:21 +0000
(09:47 -0600)
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
src/mesa/vbo/vbo_exec_api.c
patch
|
blob
|
history
diff --git
a/src/mesa/vbo/vbo_exec_api.c
b/src/mesa/vbo/vbo_exec_api.c
index b191a94c8c39e61db2f3ad3d356de8987e3e03ce..895f19745c8e5dd9217ce6316ba2c63069278e78 100644
(file)
--- a/
src/mesa/vbo/vbo_exec_api.c
+++ b/
src/mesa/vbo/vbo_exec_api.c
@@
-48,11
+48,6
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vbo_noop.h"
-#ifdef ERROR
-#undef ERROR
-#endif
-
-
/** ID/name for immediate-mode VBO */
#define IMM_BUFFER_NAME 0xaabbccdd
@@
-514,6
+509,8
@@
do { \
} \
} while (0)
+
+#undef ERROR
#define ERROR(err) _mesa_error( ctx, err, __func__ )
#define TAG(x) vbo_##x