i915tex: remove. it's deprecated and causes merge problems

we did some small changes in the beginning of the gallium3d
lifecycle in i915tex which is not in master anymore and just
causes problems when doing merges. getting rid of the headache
by just nuking it here

1 files changed, 0 insertions, 250 deletions

diff --git a/src/mesa/drivers/dri/i915tex/intel_surface.c b/src/mesa/drivers/dri/i915tex/intel_surface.c
deleted file mode 100644
index 3e86835de2..0000000000
--- a/src/mesa/drivers/dri/i915tex/intel_surface.c
+++ /dev/null
@@ -1,250 +0,0 @@
-#include "glheader.h"
-#include "context.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
-#include "utils.h"
-#include "main/macros.h"
-
-
-#include "intel_screen.h"
-
-#include "intel_context.h"
-#include "intel_buffers.h"
-#include "intel_regions.h"
-#include "intel_span.h"
-#include "intel_fbo.h"
-
-#include "pipe/p_state.h"
-#include "pipe/p_defines.h"
-#include "pipe/softpipe/sp_surface.h"
-
-
-/*
- * XXX a lof of this is a temporary kludge
- */
-
-/**
- * Note: the arithmetic/addressing in these functions is a little
- * tricky since we need to invert the Y axis.
- */
-
-
-static void
-read_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
-                GLfloat (*rrrr)[QUAD_SIZE])
-{
-   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
-   const GLint invY = sps->surface.height - y - 1;
-   const GLubyte *src = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
-   GLfloat *dst = (GLfloat *) rrrr;
-   GLubyte temp[16];
-   GLuint j;
-
-   assert(sps->surface.format == PIPE_FORMAT_U_A8_R8_G8_B8);
-
-   memcpy(temp + 8, src, 8);
-   memcpy(temp + 0, src + bytesPerRow, 8);
-
-   for (j = 0; j < 4; j++) {
-      dst[0 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 2]); /*R*/
-      dst[1 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 1]); /*G*/
-      dst[2 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 0]); /*B*/
-      dst[3 * 4 + j] = UBYTE_TO_FLOAT(temp[j * 4 + 3]); /*A*/
-   }
-}
-
-
-static void
-write_quad_f_swz(struct softpipe_surface *sps, GLint x, GLint y,
-                 GLfloat (*rrrr)[QUAD_SIZE])
-{
-   const GLfloat *src = (const GLfloat *) rrrr;
-   const GLint bytesPerRow = sps->surface.stride * sps->surface.cpp;
-   const GLint invY = sps->surface.height - y - 1;
-   GLubyte *dst = sps->surface.ptr + invY * bytesPerRow + x * sps->surface.cpp;
-   GLubyte temp[16];
-   GLuint j;
-
-   assert(sps->surface.format == PIPE_FORMAT_U_A8_R8_G8_B8);
-
-   for (j = 0; j < 4; j++) {
-      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 2], src[0 * 4 + j]); /*R*/
-      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 1], src[1 * 4 + j]); /*G*/
-      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 0], src[2 * 4 + j]); /*B*/
-      UNCLAMPED_FLOAT_TO_UBYTE(temp[j * 4 + 3], src[3 * 4 + j]); /*A*/
-   }
-
-   memcpy(dst, temp + 8, 8);
-   memcpy(dst + bytesPerRow, temp + 0, 8);
-}
-
-
-
-static void
-read_quad_z24(struct softpipe_surface *sps,
-              GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
-{
-   static const GLuint mask = 0xffffff;
-   const GLint invY = sps->surface.height - y - 1;
-   const GLuint *src
-      = (GLuint *) (sps->surface.ptr
-                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
-
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
-
-   /* extract lower three bytes */
-   zzzz[0] = src[0] & mask;
-   zzzz[1] = src[1] & mask;
-   src -= sps->surface.stride;
-   zzzz[2] = src[0] & mask;
-   zzzz[3] = src[1] & mask;
-}
-
-static void
-write_quad_z24(struct softpipe_surface *sps,
-               GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
-{
-   static const GLuint mask = 0xff000000;
-   const GLint invY = sps->surface.height - y - 1;
-   GLuint *dst
-      = (GLuint *) (sps->surface.ptr
-                    + (invY * sps->surface.stride + x) * sps->surface.cpp);
-
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
-
-   /* write lower three bytes */
-   dst[0] = (dst[0] & mask) | zzzz[0];
-   dst[1] = (dst[1] & mask) | zzzz[1];
-   dst -= sps->surface.stride;
-   dst[0] = (dst[0] & mask) | zzzz[2];
-   dst[1] = (dst[1] & mask) | zzzz[3];
-}
-
-
-static void
-read_quad_stencil(struct softpipe_surface *sps,
-                  GLint x, GLint y, GLubyte ssss[QUAD_SIZE])
-{
-   const GLint invY = sps->surface.height - y - 1;
-   const GLuint *src = (const GLuint *) (sps->surface.ptr
-                     + (invY * sps->surface.stride + x) * sps->surface.cpp);
-
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
-
-   /* extract high byte */
-   ssss[0] = src[0] >> 24;
-   ssss[1] = src[1] >> 24;
-   src -= sps->surface.stride;
-   ssss[2] = src[0] >> 24;
-   ssss[3] = src[1] >> 24;
-}
-
-static void
-write_quad_stencil(struct softpipe_surface *sps,
-                   GLint x, GLint y, const GLubyte ssss[QUAD_SIZE])
-{
-   static const GLuint mask = 0x00ffffff;
-   const GLint invY = sps->surface.height - y - 1;
-   GLuint *dst = (GLuint *) (sps->surface.ptr
-               + (invY * sps->surface.stride + x) * sps->surface.cpp);
-
-   assert(sps->surface.format == PIPE_FORMAT_Z24_S8);
-
-   /* write high byte */
-   dst[0] = (dst[0] & mask) | (ssss[0] << 24);
-   dst[1] = (dst[1] & mask) | (ssss[1] << 24);
-   dst -= sps->surface.stride;
-   dst[0] = (dst[0] & mask) | (ssss[2] << 24);
-   dst[1] = (dst[1] & mask) | (ssss[3] << 24);
-}
-
-
-static void *
-map_surface_buffer(struct pipe_buffer *pb, GLuint access_mode)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
-   assert(access_mode == PIPE_MAP_READ_WRITE);
-
-   /*LOCK_HARDWARE(intel);*/
-
-   if (irb->region) {
-      GET_CURRENT_CONTEXT(ctx);
-      struct intel_context *intel = intel_context(ctx);
-#if 0
-      intelFinish(&intel->ctx);  /* XXX need this? */
-#endif
-      intel_region_map(intel->intelScreen, irb->region);
-   }
-   pb->ptr = irb->region->map;
-
-   sps->surface.stride = irb->region->pitch;
-   sps->surface.cpp = irb->region->cpp;
-   sps->surface.ptr = irb->region->map;
-
-   return pb->ptr;
-}
-
-
-static void
-unmap_surface_buffer(struct pipe_buffer *pb)
-{
-   struct softpipe_surface *sps = (struct softpipe_surface *) pb;
-   struct intel_renderbuffer *irb = (struct intel_renderbuffer *) sps->surface.rb;
-
-   if (irb->region) {
-      GET_CURRENT_CONTEXT(ctx);
-      struct intel_context *intel = intel_context(ctx);
-      intel_region_unmap(intel->intelScreen, irb->region);
-   }
-   pb->ptr = NULL;
-
-   sps->surface.stride = 0;
-   sps->surface.cpp = 0;
-   sps->surface.ptr = NULL;
-
-   /*UNLOCK_HARDWARE(intel);*/
-}
-
-
-struct pipe_surface *
-intel_new_surface(GLuint intFormat)
-{
-   struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
-   if (!sps)
-      return NULL;
-
-   sps->surface.width = 0; /* set in intel_alloc_renderbuffer_storage() */
-   sps->surface.height = 0;
-
-   if (intFormat == GL_RGBA8) {
-      sps->surface.format = PIPE_FORMAT_U_A8_R8_G8_B8;
-      sps->read_quad_f_swz = read_quad_f_swz;
-      sps->write_quad_f_swz = write_quad_f_swz;
-   }
-   else if (intFormat == GL_RGB5) {
-      sps->surface.format = PIPE_FORMAT_U_R5_G6_B5;
-
-   }
-   else if (intFormat == GL_DEPTH_COMPONENT16) {
-      sps->surface.format = PIPE_FORMAT_U_Z16;
-
-   }
-   else if (intFormat == GL_DEPTH24_STENCIL8_EXT) {
-      sps->surface.format = PIPE_FORMAT_Z24_S8;
-      sps->read_quad_z = read_quad_z24;
-      sps->write_quad_z = write_quad_z24;
-      sps->read_quad_stencil = read_quad_stencil;
-      sps->write_quad_stencil = write_quad_stencil;
-   }
-   else {
-      /* TBD / unknown */
-
-   }
-
-   sps->surface.buffer.map = map_surface_buffer;
-   sps->surface.buffer.unmap = unmap_surface_buffer;
-
-   return &sps->surface;
-}
-