switch to new texture functions in state tracker

5 files changed, 43 insertions, 9 deletions

diff --git a/src/mesa/drivers/dri/i915pipe/Makefile b/src/mesa/drivers/dri/i915pipe/Makefile
index f9403abd730..3f3e04e978e 100644
--- a/src/mesa/drivers/dri/i915pipe/Makefile
+++ b/src/mesa/drivers/dri/i915pipe/Makefile
@@ -14,12 +14,6 @@ DRIVER_SOURCES = \
 	intel_buffer_objects.c \
 	intel_batchbuffer.c \
 	intel_tex_layout.c \
-	intel_tex_image.c \
-	intel_tex_subimage.c \
-	intel_tex_copy.c \
-	intel_tex_validate.c \
-	intel_tex_format.c \
-	intel_tex.c \
 	intel_buffers.c \
 	intel_blit.c \
 	intel_context.c \
@@ -30,6 +24,15 @@ DRIVER_SOURCES = \
 	intel_depthstencil.c \
 	intel_batchpool.c
 
+OLD_TEX =\
+	intel_tex_image.c \
+	intel_tex_subimage.c \
+	intel_tex_copy.c \
+	intel_tex_validate.c \
+	intel_tex_format.c \
+	intel_tex.c
+
+
 C_SOURCES = \
 	$(COMMON_SOURCES) \
 	$(COMMON_BM_SOURCES) \
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index e267135973d..ced4366009a 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -47,7 +47,7 @@
 #include "i830_dri.h"
 
 #include "intel_buffers.h"
-#include "intel_tex.h"
+/*#include "intel_tex.h"*/
 #include "intel_ioctl.h"
 #include "intel_batchbuffer.h"
 #include "intel_blit.h"
@@ -318,7 +318,9 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    functions->GetString = intelGetString;
    functions->UpdateState = intelInvalidateState;
 
+   /*
    intelInitTextureFuncs(functions);
+   */
    intelInitBufferFuncs(functions);
 }
 
diff --git a/src/mesa/drivers/dri/i915pipe/intel_fbo.c b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
index 2f1aa00038d..a53563f52b9 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
@@ -40,7 +40,7 @@
 #include "intel_depthstencil.h"
 #include "intel_fbo.h"
 #include "state_tracker/st_mipmap_tree.h"
-#include "intel_tex.h"
+/*#include "intel_tex.h"*/
 
 #include "pipe/p_context.h"
 
@@ -528,6 +528,7 @@ intel_render_texture(GLcontext * ctx,
                      struct gl_framebuffer *fb,
                      struct gl_renderbuffer_attachment *att)
 {
+#if 0
    struct intel_context *intel = intel_context(ctx);
    struct gl_texture_image *newImage
       = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
@@ -581,6 +582,7 @@ intel_render_texture(GLcontext * ctx,
 
    /* update drawing region, etc */
    intel_draw_buffer(ctx, fb);
+#endif
 }
 
 
diff --git a/src/mesa/drivers/dri/i915pipe/intel_screen.c b/src/mesa/drivers/dri/i915pipe/intel_screen.c
index 5b8d6256b57..81ab435f42e 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_screen.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_screen.c
@@ -38,7 +38,7 @@
 #include "intel_screen.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
-#include "intel_tex.h"
+/*#include "intel_tex.h"*/
 #include "intel_ioctl.h"
 #include "intel_fbo.h"
 
@@ -378,6 +378,31 @@ intelGetSwapInfo(__DRIdrawablePrivate * dPriv, __DRIswapInfo * sInfo)
 }
 
 
+static void
+intelSetTexOffset(__DRIcontext *pDRICtx, GLint texname,
+		  unsigned long long offset, GLint depth, GLuint pitch)
+{
+   abort();
+#if 0
+   struct intel_context *intel = (struct intel_context*)
+      ((__DRIcontextPrivate*)pDRICtx->private)->driverPrivate;
+   struct gl_texture_object *tObj = _mesa_lookup_texture(&intel->ctx, texname);
+   struct st_texture_object *stObj = st_texture_object(tObj);
+
+   if (!stObj)
+      return;
+
+   if (stObj->mt)
+      st_miptree_release(intel->pipe, &stObj->mt);
+
+   stObj->imageOverride = GL_TRUE;
+   stObj->depthOverride = depth;
+   stObj->pitchOverride = pitch;
+
+   if (offset)
+      stObj->textureOffset = offset;
+#endif
+}
 
 
 static const struct __DriverAPIRec intelAPI = {
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c b/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
index 5b25b2a43bf..0937114c7fe 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
@@ -31,7 +31,9 @@
 #include "texstore.h"
 #include "enums.h"
 
+/*
 #include "intel_context.h"
+*/
 #include "intel_tex.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_mipmap_tree.h"