diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-02-02 12:26:10 +0000 |
| commit | b59657ad965f9471574e914b861bb1d2a17d772e (patch) | |
| tree | 99a4fe6dc933472516de91773da04034626a84b5 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | 325196f548f8e46aa8fcc7b030e81ba939e7f6b7 (diff) | |
| parent | 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (diff) | |
Merge branch 'vbo-0.2'
Conflicts:
src/mesa/main/texcompress_s3tc.c
src/mesa/tnl/t_array_api.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 91305cb5a2..3d094b9db5 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -42,7 +42,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "api_arrayelt.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" -#include "array_cache/acache.h" +#include "vbo/vbo.h" #include "tnl/tnl.h" #include "tnl/t_vp_build.h" @@ -352,7 +352,7 @@ GLboolean r300_run_vb_render(GLcontext *ctx, r300EmitState(rmesa); for(i=0; i < VB->PrimitiveCount; i++){ - GLuint prim = VB->Primitive[i].mode; + GLuint prim = _tnl_translate_prim(&VB->Primitive[i]); GLuint start = VB->Primitive[i].start; GLuint length = VB->Primitive[i].count; |