gldirect: remove refs to soon-to-be-obsolete functions
authorBrian Paul <brianp@vmware.com>
Sat, 19 Sep 2009 17:01:07 +0000 (11:01 -0600)
committerBrian Paul <brianp@vmware.com>
Sat, 19 Sep 2009 17:01:27 +0000 (11:01 -0600)
I don't know if this driver is anywhere near build-able, but anyway.

src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c

index 342a742..7ac425a 100644 (file)
@@ -1346,6 +1346,8 @@ static void wmesa_update_state_first_time(
        struct swrast_device_driver     *swdd = _swrast_GetDeviceDriverReference( ctx );
        TNLcontext                                      *tnl = TNL_CONTEXT(ctx);
        
+        _mesa_init_driver_functions(&ctx->Driver);
+
        /*
        * XXX these function pointers could be initialized just once during
        * context creation since they don't depend on any state changes.
@@ -1362,8 +1364,6 @@ static void wmesa_update_state_first_time(
 
        ctx->Driver.Viewport                            = wmesa_viewport;
        
-       ctx->Driver.Accum                                       = _swrast_Accum;
-       ctx->Driver.Bitmap                                      = _swrast_Bitmap;
        ctx->Driver.Clear                                       = clear;
        
        ctx->Driver.Flush                                       = flush;
@@ -1371,28 +1371,6 @@ static void wmesa_update_state_first_time(
        ctx->Driver.ClearColor                          = clear_color;
        ctx->Driver.Enable                                      = enable;
        
-       ctx->Driver.CopyPixels                          = _swrast_CopyPixels;
-       ctx->Driver.DrawPixels                          = _swrast_DrawPixels;
-       ctx->Driver.ReadPixels                          = _swrast_ReadPixels;
-       
-       ctx->Driver.ChooseTextureFormat         = _mesa_choose_tex_format;
-       ctx->Driver.TexImage1D                          = _mesa_store_teximage1d;
-       ctx->Driver.TexImage2D                          = _mesa_store_teximage2d;
-       ctx->Driver.TexImage3D                          = _mesa_store_teximage3d;
-       ctx->Driver.TexSubImage1D                       = _mesa_store_texsubimage1d;
-       ctx->Driver.TexSubImage2D                       = _mesa_store_texsubimage2d;
-       ctx->Driver.TexSubImage3D                       = _mesa_store_texsubimage3d;
-       ctx->Driver.TestProxyTexImage           = _mesa_test_proxy_teximage;
-       
-       ctx->Driver.CopyTexImage1D                      = _swrast_copy_teximage1d;
-       ctx->Driver.CopyTexImage2D                      = _swrast_copy_teximage2d;
-       ctx->Driver.CopyTexSubImage1D           = _swrast_copy_texsubimage1d;
-       ctx->Driver.CopyTexSubImage2D           = _swrast_copy_texsubimage2d;
-       ctx->Driver.CopyTexSubImage3D           = _swrast_copy_texsubimage3d;
-       ctx->Driver.CopyColorTable                      = _swrast_CopyColorTable;
-       ctx->Driver.CopyColorSubTable           = _swrast_CopyColorSubTable;
-       ctx->Driver.CopyConvolutionFilter1D     = _swrast_CopyConvolutionFilter1D;
-       ctx->Driver.CopyConvolutionFilter2D     = _swrast_CopyConvolutionFilter2D;
        
        // Does not apply for Mesa 5.x
        //ctx->Driver.BaseCompressedTexFormat   = _mesa_base_compressed_texformat;