[Mesa-dev] [PATCH 13/23] mesa: remove Driver.BindArrayObject

Marek Olšák maraeo at gmail.com
Sun Sep 27 15:20:42 PDT 2015


From: Marek Olšák <marek.olsak at amd.com>

Nothing sets it.
---
 src/mesa/drivers/common/driverfuncs.c | 6 ------
 src/mesa/main/arrayobj.c              | 4 ----
 src/mesa/main/dd.h                    | 8 --------
 3 files changed, 18 deletions(-)

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 84d74df..da70dfd 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -176,14 +176,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->DiscardFramebuffer = NULL;
 
    _mesa_init_texture_barrier_functions(driver);
-
-   /* APPLE_vertex_array_object */
-   driver->BindArrayObject = NULL;
-
    _mesa_init_shader_object_functions(driver);
-
    _mesa_init_transform_feedback_functions(driver);
-
    _mesa_init_sampler_object_functions(driver);
 
    /* T&L stuff */
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index f727221..061e557 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -443,10 +443,6 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
 
    ctx->NewState |= _NEW_ARRAY;
    _mesa_reference_vao(ctx, &ctx->Array.VAO, newObj);
-
-   /* Pass BindVertexArray call to device driver */
-   if (ctx->Driver.BindArrayObject && newObj)
-      ctx->Driver.BindArrayObject(ctx, newObj);
 }
 
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index d85b170..446a1ba 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -747,14 +747,6 @@ struct dd_function_table {
                                 GLint *bytesWritten);
    /*@}*/
 
-
-   /**
-    * \name Vertex Array objects
-    */
-   /*@{*/
-   void (*BindArrayObject)(struct gl_context *ctx, struct gl_vertex_array_object *);
-   /*@}*/
-
    /**
     * \name GLSL-related functions (ARB extensions and OpenGL 2.x)
     */
-- 
2.1.4



More information about the mesa-dev mailing list