Checkpoint of a super-simplified i915 driver in the pipe model.

Doesn't yet compile, but when it does, it will only draw gouraud tris
and even those will be as simple as possible.  Needs some 'winsys' support
also before that can happen.

1 files changed, 304 insertions, 0 deletions

diff --git a/src/mesa/pipe/i915simple/i915_regions.c b/src/mesa/pipe/i915simple/i915_regions.c
new file mode 100644
index 0000000000..52181cf9f4
--- /dev/null
+++ b/src/mesa/pipe/i915simple/i915_regions.c
@@ -0,0 +1,304 @@
+/**************************************************************************
+ * 
+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/* Provide additional functionality on top of bufmgr buffers:
+ *   - 2d semantics and blit operations (XXX: remove/simplify blits??)
+ *   - refcounting of buffers for multiple images in a buffer.
+ *   - refcounting of buffer mappings.
+ */
+
+#include "i915_context.h"
+#include "i915_winsys.h"
+#include "i915_blit.h"
+
+
+static void
+i915_region_idle(struct pipe_context *pipe, struct pipe_region *region)
+{
+   
+}
+
+
+static GLubyte *
+i915_region_map(struct pipe_context *pipe, struct pipe_region *region)
+{
+   struct i915_context *i915 = i915_context( pipe );
+
+   if (!region->map_refcount++) {
+      region->map = i915->winsys->buffer_map( i915->winsys,
+					    region->buffer );
+   }
+
+   return region->map;
+}
+
+static void
+i915_region_unmap(struct pipe_context *pipe, struct pipe_region *region)
+{
+   struct i915_context *i915 = i915_context( pipe );
+
+   if (!--region->map_refcount) {
+      i915->winsys->buffer_unmap( i915->winsys,
+				region->buffer );
+      region->map = NULL;
+   }
+}
+
+static struct pipe_region *
+i915_region_alloc(struct pipe_context *pipe,
+		  GLuint cpp, GLuint width, GLuint height)
+{
+   struct i915_context *i915 = i915_context( pipe );
+   struct pipe_region *region = calloc(sizeof(*region), 1);
+
+   /* Choose a pitch to match hardware requirements - requires 64 byte
+    * alignment of render targets.  
+    *
+    * XXX: is this ok for textures??
+    * clearly want to be able to render to textures under some
+    * circumstances, but maybe not always a requirement.
+    */
+   unsigned pitch = ((cpp * width + 63) & ~63) / cpp;
+
+   region->cpp = cpp;
+   region->pitch = pitch;
+   region->height = height;     /* needed? */
+   region->refcount = 1;
+
+   region->buffer = i915->winsys->create_buffer( i915->winsys, 64 );
+
+   i915->winsys->buffer_data( i915->winsys,
+			      region->buffer, 
+			      pitch * cpp * height, 
+			      NULL );
+
+   return region;
+}
+
+static void
+i915_region_release(struct pipe_context *pipe, struct pipe_region **region)
+{
+   struct i915_context *i915 = i915_context( pipe );
+
+   if (!*region)
+      return;
+
+   ASSERT((*region)->refcount > 0);
+   (*region)->refcount--;
+
+   if ((*region)->refcount == 0) {
+      assert((*region)->map_refcount == 0);
+
+      i915->winsys->buffer_unreference( i915->winsys,
+				      (*region)->buffer );
+      free(*region);
+   }
+   *region = NULL;
+}
+
+
+/*
+ * XXX Move this into core Mesa?
+ */
+static void
+_mesa_copy_rect(GLubyte * dst,
+                GLuint cpp,
+                GLuint dst_pitch,
+                GLuint dst_x,
+                GLuint dst_y,
+                GLuint width,
+                GLuint height,
+                const GLubyte * src,
+                GLuint src_pitch,
+		GLuint src_x, 
+		GLuint src_y)
+{
+   GLuint i;
+
+   dst_pitch *= cpp;
+   src_pitch *= cpp;
+   dst += dst_x * cpp;
+   src += src_x * cpp;
+   dst += dst_y * dst_pitch;
+   src += src_y * dst_pitch;
+   width *= cpp;
+
+   if (width == dst_pitch && width == src_pitch)
+      memcpy(dst, src, height * width);
+   else {
+      for (i = 0; i < height; i++) {
+         memcpy(dst, src, width);
+         dst += dst_pitch;
+         src += src_pitch;
+      }
+   }
+}
+
+
+/* Upload data to a rectangular sub-region.  Lots of choices how to do this:
+ *
+ * - memcpy by span to current destination
+ * - upload data as new buffer and blit
+ *
+ * Currently always memcpy.
+ */
+static void
+i915_region_data(struct pipe_context *pipe,
+	       struct pipe_region *dst,
+	       GLuint dst_offset,
+	       GLuint dstx, GLuint dsty,
+	       const void *src, GLuint src_pitch,
+	       GLuint srcx, GLuint srcy, GLuint width, GLuint height)
+{
+   _mesa_copy_rect(pipe->region_map(pipe, dst) + dst_offset,
+                   dst->cpp,
+                   dst->pitch,
+                   dstx, dsty, width, height, src, src_pitch, srcx, srcy);
+
+   pipe->region_unmap(pipe, dst);
+}
+
+
+/* Assumes all values are within bounds -- no checking at this level -
+ * do it higher up if required.
+ */
+static void
+i915_region_copy(struct pipe_context *pipe,
+	       struct pipe_region *dst,
+	       GLuint dst_offset,
+	       GLuint dstx, GLuint dsty,
+	       struct pipe_region *src,
+	       GLuint src_offset,
+	       GLuint srcx, GLuint srcy, GLuint width, GLuint height)
+{
+   assert( dst != src );
+   assert( dst->cpp == src->cpp );
+
+   if (0) {
+      _mesa_copy_rect(pipe->region_map(pipe, dst) + dst_offset,
+		      dst->cpp,
+		      dst->pitch,
+		      dstx, dsty, 
+		      width, height, 
+		      pipe->region_map(pipe, src) + src_offset, 
+		      src->pitch, 
+		      srcx, srcy);
+
+      pipe->region_unmap(pipe, src);
+      pipe->region_unmap(pipe, dst);
+   }
+   else {
+      i915_copy_blit( i915_context(pipe),
+		      dst->cpp,
+		      src->pitch, src->buffer, src_offset,
+		      dst->pitch, dst->buffer, dst_offset,
+		      srcx, srcy, dstx, dsty, width, height );
+   }
+}
+
+/* Fill a rectangular sub-region.  Need better logic about when to
+ * push buffers into AGP - will currently do so whenever possible.
+ */
+static GLubyte *
+get_pointer(struct pipe_region *dst, GLuint x, GLuint y)
+{
+   return dst->map + (y * dst->pitch + x) * dst->cpp;
+}
+
+
+static void
+i915_region_fill(struct pipe_context *pipe,
+               struct pipe_region *dst,
+               GLuint dst_offset,
+               GLuint dstx, GLuint dsty,
+               GLuint width, GLuint height, GLuint value)
+{
+   if (0) {
+      GLuint i, j;
+
+      (void)pipe->region_map(pipe, dst);
+
+      switch (dst->cpp) {
+      case 1: {
+	 GLubyte *row = get_pointer(dst, dstx, dsty);
+	 for (i = 0; i < height; i++) {
+	    memset(row, value, width);
+	    row += dst->pitch;
+	 }
+      }
+	 break;
+      case 2: {
+	 GLushort *row = (GLushort *) get_pointer(dst, dstx, dsty);
+	 for (i = 0; i < height; i++) {
+	    for (j = 0; j < width; j++)
+	       row[j] = value;
+	    row += dst->pitch;
+	 }
+      }
+	 break;
+      case 4: {
+	 GLuint *row = (GLuint *) get_pointer(dst, dstx, dsty);
+	 for (i = 0; i < height; i++) {
+	    for (j = 0; j < width; j++)
+	       row[j] = value;
+	    row += dst->pitch;
+	 }
+      }
+	 break;
+      default:
+	 assert(0);
+	 break;
+      }
+   }
+   else {
+      i915_fill_blit( i915_context(pipe),
+		      dst->cpp,
+		      dst->pitch, 
+		      dst->buffer, dst_offset,
+		      dstx, dsty, 
+		      width, height, 
+		      value );
+   }
+}
+
+
+
+
+
+void
+i915_init_region_functions(struct i915_context *i915)
+{
+   i915->pipe.region_idle = i915_region_idle;
+   i915->pipe.region_map = i915_region_map;
+   i915->pipe.region_unmap = i915_region_unmap;
+   i915->pipe.region_alloc = i915_region_alloc;
+   i915->pipe.region_release = i915_region_release;
+   i915->pipe.region_data = i915_region_data;
+   i915->pipe.region_copy = i915_region_copy;
+   i915->pipe.region_fill = i915_region_fill;
+}
+