Remove a bunch of "ctx->Driver.function = _swrast_Function" lines since

default/fallback functions are already plugged in by the call to
_mesa_init_driver_functions().

2 files changed, 1 insertions, 31 deletions

diff --git a/src/mesa/drivers/dri/sis/sis6326_state.c b/src/mesa/drivers/dri/sis/sis6326_state.c
index be229d019f..6bc2c6de3b 100644
--- a/src/mesa/drivers/dri/sis/sis6326_state.c
+++ b/src/mesa/drivers/dri/sis/sis6326_state.c
@@ -727,27 +727,9 @@ void sis6326DDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.Enable			= sis6326DDEnable;
    ctx->Driver.FrontFace	 	= sis6326DDFrontFace;
    ctx->Driver.Fogfv			= sis6326DDFogfv;
-   ctx->Driver.Hint			= NULL;
-   ctx->Driver.Lightfv			= NULL;
    ctx->Driver.LogicOpcode	 	= sis6326DDLogicOpCode;
-   ctx->Driver.PolygonMode		= NULL;
-   ctx->Driver.PolygonStipple		= NULL;
-   ctx->Driver.RenderMode	 	= NULL;
    ctx->Driver.Scissor			= sis6326DDScissor;
    ctx->Driver.ShadeModel		= sis6326DDShadeModel;
    ctx->Driver.LightModelfv		= sis6326DDLightModelfv;
    ctx->Driver.Viewport			= sis6326DDViewport;
-
-   /* 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;
-
-   /* 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;
 }
diff --git a/src/mesa/drivers/dri/sis/sis_state.c b/src/mesa/drivers/dri/sis/sis_state.c
index a30001c746..2a10a5fbf6 100644
--- a/src/mesa/drivers/dri/sis/sis_state.c
+++ b/src/mesa/drivers/dri/sis/sis_state.c
@@ -861,18 +861,6 @@ void sisDDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.LightModelfv	 = sisDDLightModelfv;
    ctx->Driver.Viewport		 = sisDDViewport;
 
-   /* 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;
-
+   /* XXX this should go away */
    ctx->Driver.ResizeBuffers	 = sisReAllocateBuffers;
-  /* 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;
 }