Sync with trunk r63647.

[reactos.git] / dll / opengl / mesa / vbo / vbo_save_api.c

diff --git a/dll/opengl/mesa/vbo/vbo_save_api.c b/dll/opengl/mesa/vbo/vbo_save_api.c
index 280b73c..69bdbe4 100644 (file)
--- a/dll/opengl/mesa/vbo/vbo_save_api.c
+++ b/dll/opengl/mesa/vbo/vbo_save_api.c
@@ -950,21 +950,6 @@ _save_DrawElements(GLenum mode, GLsizei count, GLenum type,
 }
 
 
-static void GLAPIENTRY
-_save_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
-                        GLsizei count, GLenum type, const GLvoid * indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode;
-   (void) start;
-   (void) end;
-   (void) count;
-   (void) type;
-   (void) indices;
-   _mesa_compile_error(ctx, GL_INVALID_OPERATION, "glDrawRangeElements");
-}
-
-
 static void GLAPIENTRY
 _save_DrawArrays(GLenum mode, GLint start, GLsizei count)
 {
@@ -1084,9 +1069,8 @@ _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,
 
    _ae_map_vbos(ctx);
 
-   if (_mesa_is_bufferobj(ctx->Array.ArrayObj->ElementArrayBufferObj))
-      indices =
-         ADD_POINTERS(ctx->Array.ArrayObj->ElementArrayBufferObj->Pointer, indices);
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
+      indices =  ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);
 
    vbo_save_NotifyBegin(ctx, (mode | VBO_SAVE_PRIM_WEAK |
                               VBO_SAVE_PRIM_NO_CURRENT_UPDATE));
@@ -1115,25 +1099,6 @@ _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,
 }
 
 
-static void GLAPIENTRY
-_save_OBE_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
-                            GLsizei count, GLenum type,
-                            const GLvoid * indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   if (!_mesa_validate_DrawRangeElements(ctx, mode,
-                                         start, end, count, type, indices))
-      return;
-
-   if (save->out_of_memory)
-      return;
-
-   _save_OBE_DrawElements(mode, count, type, indices);
-}
-
-
 static void
 _save_vtxfmt_init(struct gl_context *ctx)
 {
@@ -1156,8 +1121,6 @@ _save_vtxfmt_init(struct gl_context *ctx)
    vfmt->Materialfv = _save_Materialfv;
    vfmt->Normal3f = _save_Normal3f;
    vfmt->Normal3fv = _save_Normal3fv;
-   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;
    vfmt->TexCoord1f = _save_TexCoord1f;
    vfmt->TexCoord1fv = _save_TexCoord1fv;
    vfmt->TexCoord2f = _save_TexCoord2f;
@@ -1195,7 +1158,6 @@ _save_vtxfmt_init(struct gl_context *ctx)
    vfmt->Rectf = _save_Rectf;
    vfmt->DrawArrays = _save_DrawArrays;
    vfmt->DrawElements = _save_DrawElements;
-   vfmt->DrawRangeElements = _save_DrawRangeElements;
 }
 
 
@@ -1396,7 +1358,6 @@ vbo_save_api_init(struct vbo_save_context *save)
    ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;
    ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
    ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
-   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
    _mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
 }