Mesa (gallium-0.1): Revert "mesa/st: implement MapBufferRange callback"

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Apr 23 08:59:44 UTC 2009


Module: Mesa
Branch: gallium-0.1
Commit: 6211d63c3410cd219e480be49ec19fcf2e648e13
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6211d63c3410cd219e480be49ec19fcf2e648e13

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Apr  8 17:08:50 2009 +0100

Revert "mesa/st: implement MapBufferRange callback"

This reverts commit 2e29b7d0f8238f804304b061fb0157cf586db6f9.

---

 src/mesa/state_tracker/st_cb_bufferobjects.c |   35 +-------------------------
 1 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index b79b934..07fa2af 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -212,40 +212,8 @@ st_bufferobj_map(GLcontext *ctx, GLenum target, GLenum access,
 }
 
 
-
-/**
- * Called via glMapBufferRange().
- */
-static void *
-st_bufferobj_map_range(GLcontext *ctx, GLenum target, 
-                       GLintptr offset, GLsizeiptr length, GLbitfield access,
-                       struct gl_buffer_object *obj)
-{
-   struct pipe_context *pipe = st_context(ctx)->pipe;
-   struct st_buffer_object *st_obj = st_buffer_object(obj);
-   GLuint flags = 0;
-
-   if (access & GL_MAP_WRITE_BIT)
-      flags |= PIPE_BUFFER_USAGE_CPU_WRITE;
-
-   if (access & GL_MAP_READ_BIT)
-      flags |= PIPE_BUFFER_USAGE_CPU_READ;
-
-   /* ... other flags ...
-    */
-
-   if (access & MESA_MAP_NOWAIT_BIT)
-      flags |= PIPE_BUFFER_USAGE_DONTBLOCK;
-
-   obj->Pointer = pipe_buffer_map(pipe->screen, st_obj->buffer, flags);
-   return obj->Pointer;
-}
-
-
-
-
 /**
- * Called via glUnmapBufferARB().
+ * Called via glMapBufferARB().
  */
 static GLboolean
 st_bufferobj_unmap(GLcontext *ctx, GLenum target, struct gl_buffer_object *obj)
@@ -268,6 +236,5 @@ st_init_bufferobject_functions(struct dd_function_table *functions)
    functions->BufferSubData = st_bufferobj_subdata;
    functions->GetBufferSubData = st_bufferobj_get_subdata;
    functions->MapBuffer = st_bufferobj_map;
-   functions->MapBufferRange = st_bufferobj_map_range;
    functions->UnmapBuffer = st_bufferobj_unmap;
 }




More information about the mesa-commit mailing list