aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe/softpipe
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/pipe/softpipe')
-rw-r--r--src/mesa/pipe/softpipe/sp_draw_arrays.c349
-rw-r--r--src/mesa/pipe/softpipe/sp_state_derived.c15
-rw-r--r--src/mesa/pipe/softpipe/sp_state_fs.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_state_vertex.c4
4 files changed, 22 insertions, 348 deletions
diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/mesa/pipe/softpipe/sp_draw_arrays.c
index 6213286f476..2df07eb7d6a 100644
--- a/src/mesa/pipe/softpipe/sp_draw_arrays.c
+++ b/src/mesa/pipe/softpipe/sp_draw_arrays.c
@@ -31,284 +31,15 @@
*/
-/** TEMP */
-#include "main/context.h"
-#include "main/macros.h"
-
#include "pipe/p_defines.h"
#include "pipe/p_context.h"
#include "pipe/p_winsys.h"
-
+#include "pipe/p_util.h"
#include "sp_context.h"
#include "sp_state.h"
-#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_context.h"
-#include "pipe/draw/draw_prim.h"
-
-#include "pipe/tgsi/core/tgsi_exec.h"
-#include "pipe/tgsi/core/tgsi_build.h"
-#include "pipe/tgsi/core/tgsi_util.h"
-
-
-#if defined __GNUC__
-#define ALIGN16_DECL(TYPE, NAME, SIZE) TYPE NAME[SIZE] __attribute__(( aligned( 16 ) ))
-#define ALIGN16_ASSIGN(P) P
-#else
-#define ALIGN16_DECL(TYPE, NAME, SIZE) TYPE NAME[SIZE + 1]
-#define ALIGN16_ASSIGN(P) align16(P)
-#endif
-
-
-
-static INLINE unsigned
-compute_clipmask(float cx, float cy, float cz, float cw)
-{
- unsigned mask;
-#if defined(macintosh) || defined(__powerpc__)
- /* on powerpc cliptest is 17% faster in this way. */
- mask = (((cw < cx) << CLIP_RIGHT_SHIFT));
- mask |= (((cw < -cx) << CLIP_LEFT_SHIFT));
- mask |= (((cw < cy) << CLIP_TOP_SHIFT));
- mask |= (((cw < -cy) << CLIP_BOTTOM_SHIFT));
- mask |= (((cw < cz) << CLIP_FAR_SHIFT));
- mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
-#else /* !defined(macintosh)) */
- mask = 0x0;
- if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
- if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
- if (-cy + cw < 0) mask |= CLIP_TOP_BIT;
- if ( cy + cw < 0) mask |= CLIP_BOTTOM_BIT;
- if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
- if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
-#endif /* defined(macintosh) */
- return mask;
-}
-
-
-/**
- * Fetch a float[4] vertex attribute from memory, doing format/type
- * conversion as needed.
- * XXX this might be a temporary thing.
- */
-static void
-fetch_attrib4(const void *ptr, unsigned format, float attrib[4])
-{
- /* defaults */
- attrib[1] = 0.0;
- attrib[2] = 0.0;
- attrib[3] = 1.0;
- switch (format) {
- case PIPE_FORMAT_R32G32B32A32_FLOAT:
- attrib[3] = ((float *) ptr)[3];
- /* fall-through */
- case PIPE_FORMAT_R32G32B32_FLOAT:
- attrib[2] = ((float *) ptr)[2];
- /* fall-through */
- case PIPE_FORMAT_R32G32_FLOAT:
- attrib[1] = ((float *) ptr)[1];
- /* fall-through */
- case PIPE_FORMAT_R32_FLOAT:
- attrib[0] = ((float *) ptr)[0];
- break;
- default:
- assert(0);
- }
-}
-
-
-/**
- * Transform vertices with the current vertex program/shader
- * Up to four vertices can be shaded at a time.
- * \param vbuffer the input vertex data
- * \param elts indexes of four input vertices
- * \param count number of vertices to shade [1..4]
- * \param vOut array of pointers to four output vertices
- */
-static void
-run_vertex_program(struct softpipe_context *sp,
- unsigned elts[4], unsigned count,
- struct vertex_header *vOut[])
-{
- struct tgsi_exec_machine machine;
- unsigned int j;
-
- ALIGN16_DECL(struct tgsi_exec_vector, inputs, PIPE_ATTRIB_MAX);
- ALIGN16_DECL(struct tgsi_exec_vector, outputs, PIPE_ATTRIB_MAX);
- const float *scale = sp->viewport.scale;
- const float *trans = sp->viewport.translate;
-
- assert(count <= 4);
-
-#ifdef DEBUG
- memset( &machine, 0, sizeof( machine ) );
-#endif
-
- /* init machine state */
- tgsi_exec_machine_init(
- &machine,
- sp->vs.tokens,
- PIPE_MAX_SAMPLERS,
- NULL /*samplers*/ );
-
- /* Consts does not require 16 byte alignment. */
- machine.Consts = sp->vs.constants->constant;
-
- machine.Inputs = ALIGN16_ASSIGN(inputs);
- machine.Outputs = ALIGN16_ASSIGN(outputs);
-
-
- if (0)
- {
- unsigned attr;
- for (attr = 0; attr < 16; attr++) {
- if (sp->vs.inputs_read & (1 << attr)) {
- printf("attr %d: buf_off %d src_off %d pitch %d\n",
- attr,
- sp->vertex_buffer[attr].buffer_offset,
- sp->vertex_element[attr].src_offset,
- sp->vertex_buffer[attr].pitch);
- }
- }
- }
-
- /* load machine inputs */
- for (j = 0; j < count; j++) {
- unsigned attr;
- for (attr = 0; attr < 16; attr++) {
- if (sp->vs.inputs_read & (1 << attr)) {
- const void *src
- = (const void *) ((const ubyte *) sp->mapped_vbuffer[attr]
- + sp->vertex_buffer[attr].buffer_offset
- + sp->vertex_element[attr].src_offset
- + elts[j] * sp->vertex_buffer[attr].pitch);
- float p[4];
-
- fetch_attrib4(src, sp->vertex_element[attr].src_format, p);
-
- machine.Inputs[attr].xyzw[0].f[j] = p[0]; /*X*/
- machine.Inputs[attr].xyzw[1].f[j] = p[1]; /*Y*/
- machine.Inputs[attr].xyzw[2].f[j] = p[2]; /*Z*/
- machine.Inputs[attr].xyzw[3].f[j] = p[3]; /*W*/
-#if 0
- if (attr == 0) {
- printf("Input vertex %d: %f %f %f\n",
- j, p[0], p[1], p[2]);
- }
-#endif
- }
- }
- }
-
-#if 0
- printf("Consts:\n");
- for (i = 0; i < 4; i++) {
- printf(" %d: %f %f %f %f\n", i,
- machine.Consts[i][0],
- machine.Consts[i][1],
- machine.Consts[i][2],
- machine.Consts[i][3]);
- }
-#endif
-
- /* run shader */
- tgsi_exec_machine_run( &machine );
-
-#if 0
- printf("VS result: %f %f %f %f\n",
- outputs[0].xyzw[0].f[0],
- outputs[0].xyzw[1].f[0],
- outputs[0].xyzw[2].f[0],
- outputs[0].xyzw[3].f[0]);
-#endif
-
- /* store machine results */
- assert(sp->vs.outputs_written & (1 << VERT_RESULT_HPOS));
- for (j = 0; j < count; j++) {
- unsigned attr, slot;
- float x, y, z, w;
-
- /* Handle attr[0] (position) specially: */
- x = vOut[j]->clip[0] = outputs[0].xyzw[0].f[j];
- y = vOut[j]->clip[1] = outputs[0].xyzw[1].f[j];
- z = vOut[j]->clip[2] = outputs[0].xyzw[2].f[j];
- w = vOut[j]->clip[3] = outputs[0].xyzw[3].f[j];
-
- vOut[j]->clipmask = compute_clipmask(x, y, z, w);
- vOut[j]->edgeflag = 1;
-
- /* divide by w */
- w = 1.0 / w;
- x *= w;
- y *= w;
- z *= w;
-
- /* Viewport mapping */
- vOut[j]->data[0][0] = x * scale[0] + trans[0];
- vOut[j]->data[0][1] = y * scale[1] + trans[1];
- vOut[j]->data[0][2] = z * scale[2] + trans[2];
- vOut[j]->data[0][3] = w;
-#if 0
- printf("wincoord: %f %f %f\n",
- vOut[j]->data[0][0],
- vOut[j]->data[0][1],
- vOut[j]->data[0][2]);
-#endif
-
- /* remaining attributes: */
- /* pack into sequential post-transform attrib slots */
- slot = 1;
- for (attr = 1; attr < VERT_RESULT_MAX; attr++) {
- if (sp->vs.outputs_written & (1 << attr)) {
- assert(slot < sp->nr_attrs);
- vOut[j]->data[slot][0] = outputs[attr].xyzw[0].f[j];
- vOut[j]->data[slot][1] = outputs[attr].xyzw[1].f[j];
- vOut[j]->data[slot][2] = outputs[attr].xyzw[2].f[j];
- vOut[j]->data[slot][3] = outputs[attr].xyzw[3].f[j];
- slot++;
- }
- }
- }
-
-#if 0
- memcpy(
- quad->outputs.color,
- &machine.Outputs[1].xyzw[0].f[0],
- sizeof( quad->outputs.color ) );
-#endif
-}
-
-
-/**
- * Called by the draw module when the vertx cache needs to be flushed.
- * This involves running the vertex shader.
- */
-static void vs_flush( struct draw_context *draw )
-{
- struct softpipe_context *sp = (struct softpipe_context *) draw->pipe;
- unsigned i, j;
-
- /* run vertex shader on vertex cache entries, four per invokation */
- for (i = 0; i < draw->vs.queue_nr; i += 4) {
- struct vertex_header *dests[4];
- unsigned elts[4];
- int n;
-
- for (j = 0; j < 4; j++) {
- elts[j] = draw->vs.queue[i + j].elt;
- dests[j] = draw->vs.queue[i + j].dest;
- }
-
- n = MIN2(4, draw->vs.queue_nr - i);
- assert(n > 0);
- assert(n <= 4);
-
- run_vertex_program(sp, elts, n, dests);
- }
-
- draw->vs.queue_nr = 0;
-}
@@ -322,6 +53,10 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
/**
+ * Draw vertex arrays, with optional indexing.
+ * Basically, map the vertex buffers (and drawing surfaces), then hand off
+ * the drawing to the 'draw' module.
+ *
* XXX should the element buffer be specified/bound with a separate function?
*/
void
@@ -330,7 +65,6 @@ softpipe_draw_elements(struct pipe_context *pipe,
unsigned indexSize,
unsigned mode, unsigned start, unsigned count)
{
-
struct softpipe_context *sp = softpipe_context(pipe);
struct draw_context *draw = sp->draw;
unsigned length, first, incr, i;
@@ -353,10 +87,11 @@ softpipe_draw_elements(struct pipe_context *pipe,
*/
for (i = 0; i < PIPE_ATTRIB_MAX; i++) {
if (sp->vertex_buffer[i].buffer) {
- sp->mapped_vbuffer[i]
+ void *buf
= pipe->winsys->buffer_map(pipe->winsys,
sp->vertex_buffer[i].buffer,
PIPE_BUFFER_FLAG_READ);
+ draw_set_mapped_vertex_buffer(draw, i, buf);
}
}
/* Map index buffer, if present */
@@ -364,30 +99,15 @@ softpipe_draw_elements(struct pipe_context *pipe,
mapped_indexes = pipe->winsys->buffer_map(pipe->winsys,
indexBuffer,
PIPE_BUFFER_FLAG_READ);
- draw_set_element_buffer(draw, indexSize, mapped_indexes);
+ draw_set_mapped_element_buffer(draw, indexSize, mapped_indexes);
}
else {
- draw_set_element_buffer(draw, 0, NULL); /* no index/element buffer */
+ draw_set_mapped_element_buffer(draw, 0, NULL); /* no index/element buffer */
}
- /* tell drawing pipeline we're beginning drawing */
- draw->pipeline.first->begin( draw->pipeline.first );
-
- draw->vs_flush = vs_flush;
- draw->pipe = pipe; /* XXX pass pipe to draw_create() */
-
- draw_invalidate_vcache( draw );
- draw_set_prim( draw, mode );
+ draw_arrays(draw, mode, start, count);
- /* drawing done here: */
- draw_prim(draw, start, count);
-
- /* draw any left-over buffered prims */
- draw_flush(draw);
-
- /* tell drawing pipeline we're done drawing */
- draw->pipeline.first->end( draw->pipeline.first );
/*
* unmap vertex/index buffers
@@ -395,58 +115,13 @@ softpipe_draw_elements(struct pipe_context *pipe,
for (i = 0; i < PIPE_ATTRIB_MAX; i++) {
if (sp->vertex_buffer[i].buffer) {
pipe->winsys->buffer_unmap(pipe->winsys, sp->vertex_buffer[i].buffer);
+ draw_set_mapped_vertex_buffer(draw, i, NULL);
}
}
if (indexBuffer) {
pipe->winsys->buffer_unmap(pipe->winsys, indexBuffer);
+ draw_set_mapped_element_buffer(draw, 0, NULL);
}
softpipe_unmap_surfaces(sp);
}
-
-
-
-#define EMIT_ATTR( VF_ATTR, STYLE, SIZE ) \
-do { \
- if (draw->nr_attrs >= 2) \
- draw->vf_attr_to_slot[VF_ATTR] = draw->nr_attrs - 2; \
- draw->attrs[draw->nr_attrs].attrib = VF_ATTR; \
- draw->attrs[draw->nr_attrs].format = STYLE; \
- draw->nr_attrs++; \
- draw->vertex_size += SIZE; \
-} while (0)
-
-
-/**
- * XXX very similar to same func in draw_vb.c (which will go away)
- */
-void
-draw_set_vertex_attributes2( struct draw_context *draw,
- const unsigned *slot_to_vf_attr,
- unsigned nr_attrs )
-{
- unsigned i;
-
- memset(draw->vf_attr_to_slot, 0, sizeof(draw->vf_attr_to_slot));
- draw->nr_attrs = 0;
- draw->vertex_size = 0;
-
- /*
- * First three attribs are always the same: header, clip pos, winpos
- */
- EMIT_ATTR(VF_ATTRIB_VERTEX_HEADER, EMIT_1F, 1);
- EMIT_ATTR(VF_ATTRIB_CLIP_POS, EMIT_4F, 4);
-
- assert(slot_to_vf_attr[0] == VF_ATTRIB_POS);
- EMIT_ATTR(slot_to_vf_attr[0], EMIT_4F_VIEWPORT, 4);
-
- /*
- * Remaining attribs (color, texcoords, etc)
- */
- for (i = 1; i < nr_attrs; i++)
- EMIT_ATTR(slot_to_vf_attr[i], EMIT_4F, 4);
-
- draw->vertex_size *= 4; /* floats to bytes */
-}
-
-
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 95b0cfee033..eba789e9c42 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -210,22 +210,15 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
}
}
- /* If the attributes have changed, tell the draw module (which in turn
- * tells the vf module) about the new vertex layout.
+ /* If the attributes have changed, tell the draw module about
+ * the new vertex layout.
*/
if (attr_mask != softpipe->attr_mask) {
softpipe->attr_mask = attr_mask;
-#define USE_NEW_DRAW 01
-#if USE_NEW_DRAW
- draw_set_vertex_attributes2( softpipe->draw,
- slot_to_vf_attr,
- softpipe->nr_attrs );
-#else
draw_set_vertex_attributes( softpipe->draw,
- slot_to_vf_attr,
- softpipe->nr_attrs );
-#endif
+ slot_to_vf_attr,
+ softpipe->nr_attrs );
}
}
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index 3505c2f1fb6..98d596d4c58 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -49,4 +49,6 @@ void softpipe_set_vs_state( struct pipe_context *pipe,
memcpy(&softpipe->vs, vs, sizeof(*vs));
softpipe->dirty |= SP_NEW_VS;
+
+ draw_set_vertex_shader(softpipe->draw, vs);
}
diff --git a/src/mesa/pipe/softpipe/sp_state_vertex.c b/src/mesa/pipe/softpipe/sp_state_vertex.c
index d985b20c366..18852552eb3 100644
--- a/src/mesa/pipe/softpipe/sp_state_vertex.c
+++ b/src/mesa/pipe/softpipe/sp_state_vertex.c
@@ -41,6 +41,8 @@ softpipe_set_vertex_element(struct pipe_context *pipe,
assert(index < PIPE_ATTRIB_MAX);
softpipe->vertex_element[index] = *attrib; /* struct copy */
softpipe->dirty |= SP_NEW_VERTEX;
+
+ draw_set_vertex_element(softpipe->draw, index, attrib);
}
@@ -53,4 +55,6 @@ softpipe_set_vertex_buffer(struct pipe_context *pipe,
assert(index < PIPE_ATTRIB_MAX);
softpipe->vertex_buffer[index] = *buffer; /* struct copy */
softpipe->dirty |= SP_NEW_VERTEX;
+
+ draw_set_vertex_buffer(softpipe->draw, index, buffer);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 19:46:23 +0000