vbo: return VP_NONE from get_program_mode() if running fixed-func vertex program

[mesa.git] / src / mesa / vbo / vbo_rebase.c

diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index 2a6f03797a18c1dee48cff706e93a55adb8778a5..ea87dede64627566052a5de2c0a0d18ca55a11f3 100644 (file)
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -46,9 +46,9 @@
  * of zero.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
 
 #include "vbo.h"
 
@@ -123,7 +123,8 @@ void vbo_rebase_prims( GLcontext *ctx,
 
    assert(min_index != 0);
 
-   _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
+   if (0)
+      _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
 
    if (ib) {
       /* Unfortunately need to adjust each index individually.
@@ -160,7 +161,7 @@ void vbo_rebase_prims( GLcontext *ctx,
                                 GL_ELEMENT_ARRAY_BUFFER,
                                 ib->obj);
 
-      tmp_ib.obj = ctx->Array.NullBufferObj;
+      tmp_ib.obj = ctx->Shared->NullBufferObj;
       tmp_ib.ptr = tmp_indices;
       tmp_ib.count = ib->count;
       tmp_ib.type = ib->type;