aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c2
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_surface.c218
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_surface.h5
3 files changed, 1 insertions, 224 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 054f2c84217..d418796d3c5 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -404,7 +404,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
*/
if (!getenv("INTEL_HW")) {
intel->pipe = intel_create_softpipe( intel );
- intel->pipe->surface_alloc = intel_new_surface;
+ /* use default softpipe function for surface_alloc() */
intel->pipe->supported_formats = intel_supported_formats;
}
else {
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_surface.c b/src/mesa/drivers/dri/intel_winsys/intel_surface.c
index ef2e62c8097..683a81fb63e 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_surface.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_surface.c
@@ -31,234 +31,16 @@
*/
-#include "glheader.h"
-#include "main/macros.h"
-
-#include "intel_screen.h"
#include "intel_context.h"
-#include "intel_buffers.h"
#include "intel_surface.h"
#include "pipe/p_state.h"
-#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/softpipe/sp_surface.h"
/**
- * 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.region->pitch * sps->surface.region->cpp;
- const GLint invY = sps->surface.height - y - 1;
- const GLubyte *src = sps->surface.region->map + invY * bytesPerRow + x * sps->surface.region->cpp;
- GLfloat *dst = (GLfloat *) rrrr;
- GLubyte temp[16];
- GLuint j;
-
- assert(sps->surface.format == PIPE_FORMAT_U_A8_R8_G8_B8);
- assert(x < sps->surface.width - 1);
- assert(y < sps->surface.height - 1);
-
- 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.region->pitch * sps->surface.region->cpp;
- const GLint invY = sps->surface.height - y - 1;
- GLubyte *dst = sps->surface.region->map + invY * bytesPerRow + x * sps->surface.region->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.region->map
- + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
-
- assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
-
- /* extract lower three bytes */
- zzzz[0] = src[0] & mask;
- zzzz[1] = src[1] & mask;
- zzzz[2] = src[-sps->surface.region->pitch] & mask;
- zzzz[3] = src[-sps->surface.region->pitch + 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.region->map
- + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
-
- assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
-
- /* write lower three bytes */
- dst[0] = (dst[0] & mask) | zzzz[0];
- dst[1] = (dst[1] & mask) | zzzz[1];
- dst -= sps->surface.region->pitch;
- 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.region->map
- + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
-
- assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
-
- /* extract high byte */
- ssss[0] = src[0] >> 24;
- ssss[1] = src[1] >> 24;
- src -= sps->surface.region->pitch;
- 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.region->map
- + (invY * sps->surface.region->pitch + x) * sps->surface.region->cpp);
-
- assert(sps->surface.format == PIPE_FORMAT_S8_Z24);
-
- /* write high byte */
- dst[0] = (dst[0] & mask) | (ssss[0] << 24);
- dst[1] = (dst[1] & mask) | (ssss[1] << 24);
- dst -= sps->surface.region->pitch;
- dst[0] = (dst[0] & mask) | (ssss[2] << 24);
- dst[1] = (dst[1] & mask) | (ssss[3] << 24);
-}
-
-
-
-
-static void
-a8r8g8b8_get_tile(struct pipe_surface *ps,
- GLuint x, GLuint y, GLuint w, GLuint h, GLfloat *p)
-{
- const GLuint *src
- = ((const GLuint *) (ps->region->map + ps->offset))
- + y * ps->region->pitch + x;
- GLuint i, j;
-#if 0
- assert(x + w <= ps->width);
- assert(y + h <= ps->height);
-#else
- /* temp hack */
- if (x + w > ps->width)
- w = ps->width - x;
- if (y + h > ps->height)
- h = ps->height -y;
-#endif
- for (i = 0; i < h; i++) {
- for (j = 0; j < w; j++) {
- p[0] = UBYTE_TO_FLOAT((src[j] >> 16) & 0xff);
- p[1] = UBYTE_TO_FLOAT((src[j] >> 8) & 0xff);
- p[2] = UBYTE_TO_FLOAT((src[j] >> 0) & 0xff);
- p[3] = UBYTE_TO_FLOAT((src[j] >> 24) & 0xff);
- p += 4;
- }
- src += ps->region->pitch;
- }
-}
-
-
-
-/**
- * Create a new surface of the specified format.
- * This also plugs in the quad/tile read/write functions that
- * will be used to access the buffer for rendering/texturing/etc.
- */
-struct pipe_surface *
-intel_new_surface(struct pipe_context *pipe, GLuint pipeFormat)
-{
- struct softpipe_surface *sps = CALLOC_STRUCT(softpipe_surface);
- if (!sps)
- return NULL;
-
- sps->surface.width = 0; /* set by renderbuffer::AllocStorage() */
- sps->surface.height = 0;
- sps->surface.refcount = 1;
- sps->surface.format = pipeFormat;
-
- switch (pipeFormat) {
- case 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;
- sps->surface.get_tile = a8r8g8b8_get_tile;
- break;
- case PIPE_FORMAT_U_R5_G6_B5:
- break;
- case PIPE_FORMAT_U_Z16:
- break;
- case PIPE_FORMAT_S8_Z24:
- 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;
- break;
- default:
- assert(0);
- }
-
- return &sps->surface;
-}
-
-
-/**
* Return list of surface formats supported by this driver.
*/
const GLuint *
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_surface.h b/src/mesa/drivers/dri/intel_winsys/intel_surface.h
index 83a9bff2db2..0987e963de7 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_surface.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_surface.h
@@ -29,11 +29,6 @@
#ifndef INTEL_SURFACE_H
#define INTEL_SURFACE_H
-
-extern struct pipe_surface *
-intel_new_surface(struct pipe_context *pipe, GLuint pipeFormat);
-
-
extern const GLuint *
intel_supported_formats(struct pipe_context *pipe, GLuint *numFormats);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 08:57:38 +0000