projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv04
/
nv04_vbo.c
diff --git
a/src/gallium/drivers/nv04/nv04_vbo.c
b/src/gallium/drivers/nv04/nv04_vbo.c
index 099ab100433e175767bc1433d39d0402d17bb3fb..348477181455a45260580fc8419e16021e144a2e 100644
(file)
--- a/
src/gallium/drivers/nv04/nv04_vbo.c
+++ b/
src/gallium/drivers/nv04/nv04_vbo.c
@@
-9,7
+9,7
@@
#include "nouveau/nouveau_channel.h"
#include "nouveau/nouveau_pushbuf.h"
#include "nouveau/nouveau_channel.h"
#include "nouveau/nouveau_pushbuf.h"
-
boolean
nv04_draw_elements( struct pipe_context *pipe,
+
void
nv04_draw_elements( struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
unsigned prim, unsigned start, unsigned count)
struct pipe_buffer *indexBuffer,
unsigned indexSize,
unsigned prim, unsigned start, unsigned count)
@@
-65,15
+65,13
@@
boolean nv04_draw_elements( struct pipe_context *pipe,
pipe_buffer_unmap(pscreen, indexBuffer);
draw_set_mapped_element_buffer(draw, 0, NULL);
}
pipe_buffer_unmap(pscreen, indexBuffer);
draw_set_mapped_element_buffer(draw, 0, NULL);
}
-
- return TRUE;
}
}
-
boolean
nv04_draw_arrays( struct pipe_context *pipe,
-
unsigned prim, unsigned start, unsigned count)
+
void
nv04_draw_arrays( struct pipe_context *pipe,
+ unsigned prim, unsigned start, unsigned count)
{
printf("coucou in draw arrays\n");
{
printf("coucou in draw arrays\n");
-
return
nv04_draw_elements(pipe, NULL, 0, prim, start, count);
+ nv04_draw_elements(pipe, NULL, 0, prim, start, count);
}
}