mesa: merge gallium-0.2 into gallium-master-merge

[mesa.git] / src / mesa / drivers / dri / s3v / s3v_dd.c

diff --git a/src/mesa/drivers/dri/s3v/s3v_dd.c b/src/mesa/drivers/dri/s3v/s3v_dd.c
index 3346c86a0c41489664e18e41fb7a49eca789c064..e340116f5e18daae3a6414cbfe90f05cadaf3aca 100644 (file)
--- a/src/mesa/drivers/dri/s3v/s3v_dd.c
+++ b/src/mesa/drivers/dri/s3v/s3v_dd.c
@@ -9,7 +9,8 @@
 #include "x86/common_x86_asm.h"
 #endif
 
-#include "context.h"
+#include "main/context.h"
+#include "main/framebuffer.h"
 #include "swrast/swrast.h"
 
 #define S3V_DATE "20020207"
@@ -84,24 +85,6 @@ void s3vInitExtensions( GLcontext *ctx )
  */
 void s3vInitDriverFuncs( GLcontext *ctx )
 {
-   ctx->Driver.GetBufferSize   = s3vDDGetBufferSize;
-   ctx->Driver.GetString               = s3vDDGetString;
-
-   ctx->Driver.Error                   = NULL;
-
-   /* Pixel path fallbacks
-    */
-   ctx->Driver.Accum                    = _swrast_Accum;
-   ctx->Driver.Bitmap                   = _swrast_Bitmap;
-   ctx->Driver.CopyPixels               = _swrast_CopyPixels;
-   ctx->Driver.DrawPixels               = _swrast_DrawPixels;
-   ctx->Driver.ReadPixels               = _swrast_ReadPixels;
-   ctx->Driver.ResizeBuffers            = _swrast_alloc_buffers;
-
-   /* Swrast hooks for imaging extensions:
-    */
-   ctx->Driver.CopyColorTable                  = _swrast_CopyColorTable;
-   ctx->Driver.CopyColorSubTable               = _swrast_CopyColorSubTable;
-   ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
-   ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+   ctx->Driver.GetBufferSize = s3vDDGetBufferSize;
+   ctx->Driver.GetString = s3vDDGetString;
 }