Before calling _mesa_create_context(), initialize a dd_function_table struct

by calling _mesa_init_driver_functions() and then plugging in the driver-
specific functions.
In particular, make sure ctx->Driver.NewTextureObject points to the
appropriate driver function so that _all_ texture objects are augmented
with the driver-specific data.
Put in a bunch of assertions in the texture-related driver functions that
texObj->DriverData is valid.  Remove old dead code in near future.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/i830/i830_ioctl.c b/src/mesa/drivers/dri/i830/i830_ioctl.c
index 607b813e53..a0f062505b 100644
--- a/src/mesa/drivers/dri/i830/i830_ioctl.c
+++ b/src/mesa/drivers/dri/i830/i830_ioctl.c
@@ -820,22 +820,22 @@ int i830_check_copy(int fd)
    return drmCommandNone(fd, DRM_I830_DOCOPY);
 }
 
-static void i830DDFlush( GLcontext *ctx )
+static void i830Flush( GLcontext *ctx )
 {
    i830ContextPtr imesa = I830_CONTEXT( ctx );
    I830_FIREVERTICES( imesa );
 }
 
-static void i830DDFinish( GLcontext *ctx  ) 
+static void i830Finish( GLcontext *ctx  ) 
 {
    i830ContextPtr imesa = I830_CONTEXT( ctx );
    i830DmaFinish( imesa );
 }
 
-void i830DDInitIoctlFuncs( GLcontext *ctx )
+void i830InitIoctlFuncs( struct dd_function_table *functions )
 {
-   ctx->Driver.Flush = i830DDFlush;
-   ctx->Driver.Clear = i830Clear;
-   ctx->Driver.Finish = i830DDFinish;
+   functions->Flush = i830Flush;
+   functions->Clear = i830Clear;
+   functions->Finish = i830Finish;
 }