diff options
author | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
---|---|---|
committer | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
commit | 3b8bc1f46758d4da9155419fcf558a493e729501 (patch) | |
tree | 0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801 /src/mesa/vbo/vbo_exec_api.c | |
parent | ffe58739da9eee2e99682747cc8f26e412c87430 (diff) | |
parent | ffa2659204121f703208782ff225a22e0c21b173 (diff) |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/vbo/vbo_exec_api.c')
-rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 8d13ef9d081..7f56b3b6293 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -30,19 +30,24 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. * Keith Whitwell <keith@tungstengraphics.com> */ -#include "glheader.h" -#include "context.h" -#include "macros.h" -#include "vtxfmt.h" -#include "dlist.h" -#include "state.h" -#include "light.h" -#include "api_arrayelt.h" -#include "api_noop.h" -#include "dispatch.h" +#include "main/glheader.h" +#include "main/context.h" +#include "main/macros.h" +#include "main/vtxfmt.h" +#include "main/dlist.h" +#include "main/state.h" +#include "main/light.h" +#include "main/api_arrayelt.h" +#include "main/api_noop.h" +#include "glapi/dispatch.h" #include "vbo_context.h" +#ifdef ERROR +#undef ERROR +#endif + + static void reset_attrfv( struct vbo_exec_context *exec ); |