summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-08-31 00:39:32 +0000
committerBrian Paul <[email protected]>2005-08-31 00:39:32 +0000
commit275a563bea0c0eef7bcd52ddc493803acf94c37e (patch)
tree963729265404afacdda215b7b9d17892b8010229
parentf830f640b63a51a152cc17d176a4e285a9a5af9d (diff)
remove redundant ctx->Driver fallback assignments that were already done in _mesa_init_driver_functions()
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_state.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 3a491f5ded1..ce23aae1797 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -42,7 +42,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "buffers.h"
#include "context.h"
-#include "swrast/swrast.h"
#include "array_cache/acache.h"
#include "tnl/tnl.h"
#include "tnl/t_pipeline.h"
@@ -2229,6 +2228,8 @@ static void radeonWrapRunPipeline( GLcontext *ctx )
/* Initialize the driver's state functions.
+ * Many of the ctx->Driver functions might have been initialized to
+ * software defaults in the earlier _mesa_init_driver_functions() call.
*/
void radeonInitStateFuncs( GLcontext *ctx )
{
@@ -2275,21 +2276,6 @@ void radeonInitStateFuncs( GLcontext *ctx )
ctx->Driver.StencilOp = radeonStencilOp;
ctx->Driver.Viewport = radeonViewport;
- /* 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;
-
TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange = radeonUpdateMaterial;
TNL_CONTEXT(ctx)->Driver.RunPipeline = radeonWrapRunPipeline;
}