Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch

7 files changed, 11 insertions, 36 deletions

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3055564341..ee4cbd0d38 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -149,7 +149,7 @@ depend: $(ALL_SOURCES)
 subdirs:
 	@ (cd x86 ; $(MAKE))
 	@ (cd x86-64 ; $(MAKE))
-	#(cd pipe/softpipe ; $(MAKE))
+	(cd pipe/softpipe ; $(MAKE))
 
 install: default
 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
@@ -182,6 +182,7 @@ clean:
 	(cd drivers/dri && $(MAKE) clean)
 	(cd x86 && $(MAKE) clean)
 	(cd x86-64 && $(MAKE) clean)
+	(cd pipe/softpipe ; $(MAKE) clean )
 
 
 include depend
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
index 8fd785d20d..fc9d60c88e 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
@@ -37,7 +37,6 @@
 #include "utils.h"
 #include "drirenderbuffer.h"
 #include "framebuffer.h"
-#include "swrast/swrast.h"
 #include "vblank.h"
 
 #include "pipe/p_context.h"
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index b66dbe71e5..bab94e2697 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -35,8 +35,6 @@
 #include "imports.h"
 #include "points.h"
 
-#include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
 #include "tnl/tnl.h"
 
 #include "tnl/t_pipeline.h"
@@ -237,8 +235,6 @@ static const struct dri_debug_control debug_control[] = {
 static void
 intelInvalidateState(GLcontext * ctx, GLuint new_state)
 {
-   _swrast_InvalidateState(ctx, new_state);
-   _swsetup_InvalidateState(ctx, new_state);
    _vbo_InvalidateState(ctx, new_state);
    _tnl_InvalidateState(ctx, new_state);
    _tnl_invalidate_vertex_state(ctx, new_state);
@@ -254,9 +250,6 @@ intelFlush(GLcontext * ctx)
 {
    struct intel_context *intel = intel_context(ctx);
 
-   if (intel->Fallback)
-      _swrast_flush(ctx);
-
    INTEL_FIREVERTICES(intel);
 
    if (intel->batch->map != intel->batch->ptr)
@@ -323,10 +316,6 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    functions->Finish = intelFinish;
    functions->GetString = intelGetString;
    functions->UpdateState = intelInvalidateState;
-   functions->CopyColorTable = _swrast_CopyColorTable;
-   functions->CopyColorSubTable = _swrast_CopyColorSubTable;
-   functions->CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
-   functions->CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
 
    intelInitTextureFuncs(functions);
    intelInitPixelFuncs(functions);
@@ -402,14 +391,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    ctx->Const.MaxColorAttachments = 4;  /* XXX FBO: review this */
 
    /* Initialize the software rasterizer and helper modules. */
-   _swrast_CreateContext(ctx);
    _vbo_CreateContext(ctx);
    _tnl_CreateContext(ctx);
-   _swsetup_CreateContext(ctx);
-
-   /* Configure swrast to match hardware characteristics: */
-   _swrast_allow_pixel_fog(ctx, GL_FALSE);
-   _swrast_allow_vertex_fog(ctx, GL_TRUE);
 
    /*
     * Pipe-related setup
@@ -531,11 +514,9 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
       //intel->vtbl.destroy(intel);
 
       release_texture_heaps = (intel->ctx.Shared->RefCount == 1);
-      _swsetup_DestroyContext(&intel->ctx);
       _tnl_DestroyContext(&intel->ctx);
       _vbo_DestroyContext(&intel->ctx);
 
-      _swrast_DestroyContext(&intel->ctx);
       intel->Fallback = 0;      /* don't call _swrast_Flush later */
 
       intel_batchbuffer_free(intel->batch);
@@ -692,9 +673,6 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
        */
       intel->numClipRects = 0;
 
-      if (intel->Fallback)
-	 _swrast_flush(&intel->ctx);
-
       INTEL_FIREVERTICES(intel);
 
       if (intel->batch->map != intel->batch->ptr)
diff --git a/src/mesa/drivers/dri/i915pipe/intel_ioctl.c b/src/mesa/drivers/dri/i915pipe/intel_ioctl.c
index fb5b518903..154a3e289f 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_ioctl.c
@@ -33,7 +33,6 @@
 
 #include "mtypes.h"
 #include "context.h"
-#include "swrast/swrast.h"
 
 #include "intel_context.h"
 #include "intel_ioctl.h"
diff --git a/src/mesa/drivers/dri/i915pipe/intel_pixel.c b/src/mesa/drivers/dri/i915pipe/intel_pixel.c
index 74d4ce7f2a..27de2a6636 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_pixel.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_pixel.c
@@ -26,7 +26,6 @@
  **************************************************************************/
 
 #include "state.h"
-#include "swrast/swrast.h"
 
 #include "intel_context.h"
 #include "intel_pixel.h"
@@ -35,9 +34,4 @@
 void
 intelInitPixelFuncs(struct dd_function_table *functions)
 {
-   functions->Accum = _swrast_Accum;
-   functions->Bitmap = _swrast_Bitmap;
-   functions->CopyPixels = _swrast_CopyPixels;
-   functions->ReadPixels = _swrast_ReadPixels;
-   functions->DrawPixels = _swrast_DrawPixels;
 }
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c b/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
index 6deb6abd4d..6f4f75079e 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
@@ -231,8 +231,11 @@ intelCopyTexImage2D(GLcontext * ctx, GLenum target, GLint level,
    return;
 
  fail:
+#if 0
    _swrast_copy_teximage2d(ctx, target, level, internalFormat, x, y,
                            width, height, border);
+#endif
+   assert(0);
 }
 
 
@@ -256,7 +259,10 @@ intelCopyTexSubImage1D(GLcontext * ctx, GLenum target, GLint level,
    if (!do_copy_texsubimage(intel_context(ctx),
                             intel_texture_image(texImage),
                             internalFormat, xoffset, 0, x, y, width, 1)) {
+#if 0
       _swrast_copy_texsubimage1d(ctx, target, level, xoffset, x, y, width);
+#endif
+      assert(0);
    }
 }
 
@@ -283,10 +289,10 @@ intelCopyTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
                             intel_texture_image(texImage),
                             internalFormat,
                             xoffset, yoffset, x, y, width, height)) {
-
-      DBG("%s - fallback to swrast\n", __FUNCTION__);
-
+#if 0
       _swrast_copy_texsubimage2d(ctx, target, level,
                                  xoffset, yoffset, x, y, width, height);
+#endif
+      assert(0);
    }
 }
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile
index 947983baf0..04464154e7 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -40,5 +40,3 @@ include ../Makefile.template
 
 symlinks:
 
-default::
-	cd ../.. ; make