summaryrefslogtreecommitdiff
path: root/src/mesa/pipe
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-07-30 17:16:38 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-07-30 17:16:38 -0600
commitf884f6886eb043ea2e2e2b5471afbc58639f3a81 (patch)
tree216399d87572b7f30696835c434904dbe5fd0929 /src/mesa/pipe
parent7baa0865b114776cc1672c5e97e63c282e25285f (diff)
parent4576d754c98e3fb5d413e294d48fb70a893defcf (diff)
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/pipe')
-rw-r--r--src/mesa/pipe/p_state.h16
-rw-r--r--src/mesa/pipe/softpipe/sp_context.c13
-rw-r--r--src/mesa/pipe/softpipe/sp_quad_depth_test.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_z_surface.c118
-rw-r--r--src/mesa/pipe/softpipe/sp_z_surface.h37
5 files changed, 179 insertions, 7 deletions
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 4ae8928018..9973a7b8dd 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -239,6 +239,7 @@ struct pipe_sampler_state
/**
* A mappable buffer (vertex data, pixel data, etc)
+ * XXX replace with "intel_region".
*/
struct pipe_buffer
{
@@ -247,7 +248,7 @@ struct pipe_buffer
const void *src);
void *(*map)(struct pipe_buffer *pb, GLuint access_mode);
void (*unmap)(struct pipe_buffer *pb);
- void *ptr; /**< address, only valid while mapped */
+ GLubyte *ptr; /**< address, only valid while mapped */
GLuint mode; /**< PIPE_MAP_x, only valid while mapped */
};
@@ -261,12 +262,13 @@ struct pipe_surface
struct pipe_buffer buffer; /**< surfaces can be mapped */
GLuint format:5; /**< PIPE_FORMAT_x */
GLuint width, height;
-#if 0
- GLubyte *ptr;
- GLint stride;
- GLuint cpp;
- GLuint format;
-#endif
+
+ GLint stride, cpp;
+ GLubyte *ptr; /**< only valid while mapped, may not equal buffer->ptr */
+
+ void *rb; /**< Ptr back to renderbuffer (temporary?) */
+
+ void (*resize)(struct pipe_surface *ps, GLuint width, GLuint height);
};
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 6b44fabfa4..8655aa83fd 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -49,6 +49,13 @@ static void map_surfaces(struct softpipe_context *sp)
struct pipe_buffer *buf = &sps->surface.buffer;
buf->map(buf, PIPE_MAP_READ_WRITE);
}
+
+ if (sp->framebuffer.zbuf) {
+ struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
+ struct pipe_buffer *buf = &sps->surface.buffer;
+ buf->map(buf, PIPE_MAP_READ_WRITE);
+ }
+
/* XXX depth & stencil bufs */
}
@@ -62,6 +69,12 @@ static void unmap_surfaces(struct softpipe_context *sp)
struct pipe_buffer *buf = &sps->surface.buffer;
buf->unmap(buf);
}
+
+ if (sp->framebuffer.zbuf) {
+ struct softpipe_surface *sps = softpipe_surface(sp->framebuffer.zbuf);
+ struct pipe_buffer *buf = &sps->surface.buffer;
+ buf->unmap(buf);
+ }
/* XXX depth & stencil bufs */
}
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
index d47c4c42b8..a26bd51d84 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/mesa/pipe/softpipe/sp_quad_depth_test.c
@@ -59,6 +59,8 @@ sp_depth_test_quad(struct quad_stage *qs, struct quad_header *quad)
*/
if (sps->surface.format == PIPE_FORMAT_U_Z16)
scale = 65535.0;
+ else if (sps->surface.format == PIPE_FORMAT_Z24_S8)
+ scale = (float) ((1 << 24) - 1);
else
assert(0); /* XXX fix this someday */
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.c b/src/mesa/pipe/softpipe/sp_z_surface.c
new file mode 100644
index 0000000000..662a4a15ee
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_z_surface.c
@@ -0,0 +1,118 @@
+/**************************************************************************
+ *
+ * Copyright 2003 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.
+ *
+ **************************************************************************/
+
+
+/**
+ * Software Z buffer/surface.
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "pipe/p_state.h"
+#include "pipe/p_defines.h"
+#include "sp_surface.h"
+#include "sp_z_surface.h"
+
+static void*
+z16_map(struct pipe_buffer *pb, GLuint access_mode)
+{
+ struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+ sps->surface.ptr = pb->ptr;
+ return pb->ptr;
+}
+
+static void
+z16_unmap(struct pipe_buffer *pb)
+{
+ struct softpipe_surface *sps = (struct softpipe_surface *) pb;
+ sps->surface.ptr = NULL;
+}
+
+static void
+z16_resize(struct pipe_surface *ps, GLuint width, GLuint height)
+{
+ struct softpipe_surface *sps = (struct softpipe_surface *) ps;
+
+ if (sps->surface.buffer.ptr)
+ free(sps->surface.buffer.ptr);
+
+ ps->buffer.ptr = (GLubyte *) malloc(width * height * sizeof(GLushort));
+ ps->width = width;
+ ps->height = height;
+
+ sps->surface.stride = sps->surface.width;
+ sps->surface.cpp = 2;
+}
+
+static void
+z16_read_quad_z(struct softpipe_surface *sps,
+ GLint x, GLint y, GLuint zzzz[QUAD_SIZE])
+{
+ const GLushort *src
+ = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+
+ /* converting GLushort to GLuint: */
+ zzzz[0] = src[0];
+ zzzz[1] = src[1];
+ zzzz[2] = src[sps->surface.width];
+ zzzz[3] = src[sps->surface.width + 1];
+}
+
+static void
+z16_write_quad_z(struct softpipe_surface *sps,
+ GLint x, GLint y, const GLuint zzzz[QUAD_SIZE])
+{
+ GLushort *dst = (GLushort *) sps->surface.ptr + y * sps->surface.stride + x;
+
+ /* converting GLuint to GLushort: */
+ dst[0] = zzzz[0];
+ dst[1] = zzzz[1];
+ dst[sps->surface.width] = zzzz[2];
+ dst[sps->surface.width + 1] = zzzz[3];
+}
+
+struct softpipe_surface *
+softpipe_new_z_surface(GLuint depth)
+{
+ struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
+ if (!sps)
+ return NULL;
+
+ /* XXX ignoring depth param for now */
+
+ sps->surface.format = PIPE_FORMAT_U_Z16;
+
+ sps->surface.resize = z16_resize;
+ sps->surface.buffer.map = z16_map;
+ sps->surface.buffer.unmap = z16_unmap;
+ sps->read_quad_z = z16_read_quad_z;
+ sps->write_quad_z = z16_write_quad_z;
+
+ return sps;
+}
diff --git a/src/mesa/pipe/softpipe/sp_z_surface.h b/src/mesa/pipe/softpipe/sp_z_surface.h
new file mode 100644
index 0000000000..9c3c43ca57
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_z_surface.h
@@ -0,0 +1,37 @@
+/**************************************************************************
+ *
+ * Copyright 2003 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.
+ *
+ **************************************************************************/
+
+
+#ifndef SP_Z_SURFACE_H
+#define SP_Z_SURFACE_H
+
+
+extern struct softpipe_surface *
+softpipe_new_z_surface(GLuint depth);
+
+
+#endif /* SP_Z_SURFACE_H */