AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Browse Source
This commit is contained in:
Ben Skeggs
2007-12-10 16:30:24 +11:00
parent 3b2598c70b 63e2ab83f6
commit 9d651164d8
9 changed files with 127 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/pipe/draw/draw_context.c
+2 -1
View File
@@ -102,7 +102,8 @@ void draw_destroy( struct draw_context *draw )
draw->pipeline.cull->destroy( draw->pipeline.cull );
draw->pipeline.feedback->destroy( draw->pipeline.feedback );
draw->pipeline.validate->destroy( draw->pipeline.validate );
draw->pipeline.rasterize->destroy( draw->pipeline.rasterize );
if (draw->pipeline.rasterize)
draw->pipeline.rasterize->destroy( draw->pipeline.rasterize );
FREE( draw->vcache.vertex[0] ); /* Frees all the vertices. */
FREE( draw );
}
src/mesa/pipe/softpipe/sp_context.h
+1 -1
View File
@@ -154,7 +154,7 @@ struct softpipe_context {
struct draw_stage *setup;
struct draw_stage *vbuf;
struct pipe_surface *cbuf; /**< current color buffer (one of cbufs) */
uint current_cbuf; /**< current color buffer being written to */
struct softpipe_tile_cache *cbuf_cache[PIPE_MAX_COLOR_BUFS];
struct softpipe_tile_cache *zbuf_cache;
src/mesa/pipe/softpipe/sp_quad.c
+1 -1
View File
@@ -77,7 +77,7 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
if (sp->framebuffer.num_cbufs == 1) {
/* the usual case: write to exactly one colorbuf */
sp->cbuf = sp->framebuffer.cbufs[0];
sp->current_cbuf = 0;
}
else {
/* insert bufloop stage */
src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+7 -6
View File
@@ -16,6 +16,7 @@ alpha_test_quad(struct quad_stage *qs, struct quad_header *quad)
struct softpipe_context *softpipe = qs->softpipe;
const float ref = softpipe->alpha_test->ref;
unsigned passMask = 0x0, j;
const float *aaaa = quad->outputs.color[3];
switch (softpipe->alpha_test->func) {
case PIPE_FUNC_NEVER:
@@ -27,42 +28,42 @@ alpha_test_quad(struct quad_stage *qs, struct quad_header *quad)
* passMask = (quad->outputs.color[3] <= vec4(ref));
*/
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] < ref) {
if (aaaa[j] < ref) {
passMask |= (1 << j);
}
}
break;
case PIPE_FUNC_EQUAL:
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] == ref) {
if (aaaa[j] == ref) {
passMask |= (1 << j);
}
}
break;
case PIPE_FUNC_LEQUAL:
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] <= ref) {
if (aaaa[j] <= ref) {
passMask |= (1 << j);
}
}
break;
case PIPE_FUNC_GREATER:
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] > ref) {
if (aaaa[j] > ref) {
passMask |= (1 << j);
}
}
break;
case PIPE_FUNC_NOTEQUAL:
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] != ref) {
if (aaaa[j] != ref) {
passMask |= (1 << j);
}
}
break;
case PIPE_FUNC_GEQUAL:
for (j = 0; j < QUAD_SIZE; j++) {
if (quad->outputs.color[3][j] >= ref) {
if (aaaa[j] >= ref) {
passMask |= (1 << j);
}
}
src/mesa/pipe/softpipe/sp_quad_blend.c
+102 -98
View File
@@ -107,8 +107,10 @@ logicop_quad(struct quad_stage *qs, struct quad_header *quad)
uint *dst4 = (uint *) dst;
uint *res4 = (uint *) res;
struct softpipe_cached_tile *
tile = sp_get_cached_tile(softpipe, softpipe->cbuf_cache[0],
tile = sp_get_cached_tile(softpipe,
softpipe->cbuf_cache[softpipe->current_cbuf],
quad->x0, quad->y0);
float (*quadColor)[4] = quad->outputs.color;
uint i, j;
/* get/swizzle dest colors */
@@ -127,10 +129,10 @@ logicop_quad(struct quad_stage *qs, struct quad_header *quad)
UNCLAMPED_FLOAT_TO_UBYTE(dst[j][2], dest[j][2]); /* P2 */
UNCLAMPED_FLOAT_TO_UBYTE(dst[j][3], dest[j][3]); /* P3 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][0], quad->outputs.color[j][0]); /* P0 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][1], quad->outputs.color[j][1]); /* P1 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][2], quad->outputs.color[j][2]); /* P2 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][3], quad->outputs.color[j][3]); /* P3 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][0], quadColor[j][0]); /* P0 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][1], quadColor[j][1]); /* P1 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][2], quadColor[j][2]); /* P2 */
UNCLAMPED_FLOAT_TO_UBYTE(src[j][3], quadColor[j][3]); /* P3 */
}
switch (softpipe->blend->logicop_func) {
@@ -203,10 +205,10 @@ logicop_quad(struct quad_stage *qs, struct quad_header *quad)
}
for (j = 0; j < 4; j++) {
quad->outputs.color[j][0] = UBYTE_TO_FLOAT(res[j][0]);
quad->outputs.color[j][1] = UBYTE_TO_FLOAT(res[j][1]);
quad->outputs.color[j][2] = UBYTE_TO_FLOAT(res[j][2]);
quad->outputs.color[j][3] = UBYTE_TO_FLOAT(res[j][3]);
quadColor[j][0] = UBYTE_TO_FLOAT(res[j][0]);
quadColor[j][1] = UBYTE_TO_FLOAT(res[j][1]);
quadColor[j][2] = UBYTE_TO_FLOAT(res[j][2]);
quadColor[j][3] = UBYTE_TO_FLOAT(res[j][3]);
}
/* pass quad to next stage */
@@ -224,8 +226,10 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
static const float one[4] = { 1, 1, 1, 1 };
float source[4][QUAD_SIZE], dest[4][QUAD_SIZE];
struct softpipe_cached_tile *tile
= sp_get_cached_tile(softpipe, softpipe->cbuf_cache[0],
= sp_get_cached_tile(softpipe,
softpipe->cbuf_cache[softpipe->current_cbuf],
quad->x0, quad->y0);
float (*quadColor)[4] = quad->outputs.color;
uint i, j;
if (softpipe->blend->logicop_enable) {
@@ -247,39 +251,39 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
*/
switch (softpipe->blend->rgb_src_factor) {
case PIPE_BLENDFACTOR_ONE:
VEC4_COPY(source[0], quad->outputs.color[0]); /* R */
VEC4_COPY(source[1], quad->outputs.color[1]); /* G */
VEC4_COPY(source[2], quad->outputs.color[2]); /* B */
VEC4_COPY(source[0], quadColor[0]); /* R */
VEC4_COPY(source[1], quadColor[1]); /* G */
VEC4_COPY(source[2], quadColor[2]); /* B */
break;
case PIPE_BLENDFACTOR_SRC_COLOR:
VEC4_MUL(source[0], quad->outputs.color[0], quad->outputs.color[0]); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], quad->outputs.color[1]); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], quad->outputs.color[2]); /* B */
VEC4_MUL(source[0], quadColor[0], quadColor[0]); /* R */
VEC4_MUL(source[1], quadColor[1], quadColor[1]); /* G */
VEC4_MUL(source[2], quadColor[2], quadColor[2]); /* B */
break;
case PIPE_BLENDFACTOR_SRC_ALPHA:
{
const float *alpha = quad->outputs.color[3];
VEC4_MUL(source[0], quad->outputs.color[0], alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], alpha); /* B */
const float *alpha = quadColor[3];
VEC4_MUL(source[0], quadColor[0], alpha); /* R */
VEC4_MUL(source[1], quadColor[1], alpha); /* G */
VEC4_MUL(source[2], quadColor[2], alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_DST_COLOR:
VEC4_MUL(source[0], quad->outputs.color[0], dest[0]); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], dest[1]); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], dest[2]); /* B */
VEC4_MUL(source[0], quadColor[0], dest[0]); /* R */
VEC4_MUL(source[1], quadColor[1], dest[1]); /* G */
VEC4_MUL(source[2], quadColor[2], dest[2]); /* B */
break;
case PIPE_BLENDFACTOR_DST_ALPHA:
{
const float *alpha = dest[3];
VEC4_MUL(source[0], quad->outputs.color[0], alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], alpha); /* B */
VEC4_MUL(source[0], quadColor[0], alpha); /* R */
VEC4_MUL(source[1], quadColor[1], alpha); /* G */
VEC4_MUL(source[2], quadColor[2], alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
{
const float *alpha = quad->outputs.color[3];
const float *alpha = quadColor[3];
float diff[4];
VEC4_SUB(diff, one, dest[3]);
VEC4_MIN(source[0], alpha, diff); /* R */
@@ -291,20 +295,20 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
{
float comp[4];
VEC4_SCALAR(comp, softpipe->blend_color.color[0]); /* R */
VEC4_MUL(source[0], quad->outputs.color[0], comp); /* R */
VEC4_MUL(source[0], quadColor[0], comp); /* R */
VEC4_SCALAR(comp, softpipe->blend_color.color[1]); /* G */
VEC4_MUL(source[1], quad->outputs.color[1], comp); /* G */
VEC4_MUL(source[1], quadColor[1], comp); /* G */
VEC4_SCALAR(comp, softpipe->blend_color.color[2]); /* B */
VEC4_MUL(source[2], quad->outputs.color[2], comp); /* B */
VEC4_MUL(source[2], quadColor[2], comp); /* B */
}
break;
case PIPE_BLENDFACTOR_CONST_ALPHA:
{
float alpha[4];
VEC4_SCALAR(alpha, softpipe->blend_color.color[3]);
VEC4_MUL(source[0], quad->outputs.color[0], alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], alpha); /* B */
VEC4_MUL(source[0], quadColor[0], alpha); /* R */
VEC4_MUL(source[1], quadColor[1], alpha); /* G */
VEC4_MUL(source[2], quadColor[2], alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_SRC1_COLOR:
@@ -321,41 +325,41 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_INV_SRC_COLOR:
{
float inv_comp[4];
VEC4_SUB(inv_comp, one, quad->outputs.color[0]); /* R */
VEC4_MUL(source[0], quad->outputs.color[0], inv_comp); /* R */
VEC4_SUB(inv_comp, one, quad->outputs.color[1]); /* G */
VEC4_MUL(source[1], quad->outputs.color[1], inv_comp); /* G */
VEC4_SUB(inv_comp, one, quad->outputs.color[2]); /* B */
VEC4_MUL(source[2], quad->outputs.color[2], inv_comp); /* B */
VEC4_SUB(inv_comp, one, quadColor[0]); /* R */
VEC4_MUL(source[0], quadColor[0], inv_comp); /* R */
VEC4_SUB(inv_comp, one, quadColor[1]); /* G */
VEC4_MUL(source[1], quadColor[1], inv_comp); /* G */
VEC4_SUB(inv_comp, one, quadColor[2]); /* B */
VEC4_MUL(source[2], quadColor[2], inv_comp); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
{
float inv_alpha[4];
VEC4_SUB(inv_alpha, one, quad->outputs.color[3]);
VEC4_MUL(source[0], quad->outputs.color[0], inv_alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], inv_alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], inv_alpha); /* B */
VEC4_SUB(inv_alpha, one, quadColor[3]);
VEC4_MUL(source[0], quadColor[0], inv_alpha); /* R */
VEC4_MUL(source[1], quadColor[1], inv_alpha); /* G */
VEC4_MUL(source[2], quadColor[2], inv_alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_DST_ALPHA:
{
float inv_alpha[4];
VEC4_SUB(inv_alpha, one, dest[3]);
VEC4_MUL(source[0], quad->outputs.color[0], inv_alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], inv_alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], inv_alpha); /* B */
VEC4_MUL(source[0], quadColor[0], inv_alpha); /* R */
VEC4_MUL(source[1], quadColor[1], inv_alpha); /* G */
VEC4_MUL(source[2], quadColor[2], inv_alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_DST_COLOR:
{
float inv_comp[4];
VEC4_SUB(inv_comp, one, dest[0]); /* R */
VEC4_MUL(source[0], quad->outputs.color[0], inv_comp); /* R */
VEC4_MUL(source[0], quadColor[0], inv_comp); /* R */
VEC4_SUB(inv_comp, one, dest[1]); /* G */
VEC4_MUL(source[1], quad->outputs.color[1], inv_comp); /* G */
VEC4_MUL(source[1], quadColor[1], inv_comp); /* G */
VEC4_SUB(inv_comp, one, dest[2]); /* B */
VEC4_MUL(source[2], quad->outputs.color[2], inv_comp); /* B */
VEC4_MUL(source[2], quadColor[2], inv_comp); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_CONST_COLOR:
@@ -363,22 +367,22 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
float inv_comp[4];
/* R */
VEC4_SCALAR(inv_comp, 1.0f - softpipe->blend_color.color[0]);
VEC4_MUL(source[0], quad->outputs.color[0], inv_comp);
VEC4_MUL(source[0], quadColor[0], inv_comp);
/* G */
VEC4_SCALAR(inv_comp, 1.0f - softpipe->blend_color.color[1]);
VEC4_MUL(source[1], quad->outputs.color[1], inv_comp);
VEC4_MUL(source[1], quadColor[1], inv_comp);
/* B */
VEC4_SCALAR(inv_comp, 1.0f - softpipe->blend_color.color[2]);
VEC4_MUL(source[2], quad->outputs.color[2], inv_comp);
VEC4_MUL(source[2], quadColor[2], inv_comp);
}
break;
case PIPE_BLENDFACTOR_INV_CONST_ALPHA:
{
float inv_alpha[4];
VEC4_SCALAR(inv_alpha, 1.0f - softpipe->blend_color.color[3]);
VEC4_MUL(source[0], quad->outputs.color[0], inv_alpha); /* R */
VEC4_MUL(source[1], quad->outputs.color[1], inv_alpha); /* G */
VEC4_MUL(source[2], quad->outputs.color[2], inv_alpha); /* B */
VEC4_MUL(source[0], quadColor[0], inv_alpha); /* R */
VEC4_MUL(source[1], quadColor[1], inv_alpha); /* G */
VEC4_MUL(source[2], quadColor[2], inv_alpha); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_SRC1_COLOR:
@@ -396,24 +400,24 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
*/
switch (softpipe->blend->alpha_src_factor) {
case PIPE_BLENDFACTOR_ONE:
VEC4_COPY(source[3], quad->outputs.color[3]); /* A */
VEC4_COPY(source[3], quadColor[3]); /* A */
break;
case PIPE_BLENDFACTOR_SRC_COLOR:
/* fall-through */
case PIPE_BLENDFACTOR_SRC_ALPHA:
{
const float *alpha = quad->outputs.color[3];
VEC4_MUL(source[3], quad->outputs.color[3], alpha); /* A */
const float *alpha = quadColor[3];
VEC4_MUL(source[3], quadColor[3], alpha); /* A */
}
break;
case PIPE_BLENDFACTOR_DST_COLOR:
/* fall-through */
case PIPE_BLENDFACTOR_DST_ALPHA:
VEC4_MUL(source[3], quad->outputs.color[3], dest[3]); /* A */
VEC4_MUL(source[3], quadColor[3], dest[3]); /* A */
break;
case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
{
const float *alpha = quad->outputs.color[3];
const float *alpha = quadColor[3];
float diff[4];
VEC4_SUB(diff, one, dest[3]);
VEC4_MIN(source[3], alpha, diff); /* A */
@@ -425,7 +429,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
{
float comp[4];
VEC4_SCALAR(comp, softpipe->blend_color.color[3]); /* A */
VEC4_MUL(source[3], quad->outputs.color[3], comp); /* A */
VEC4_MUL(source[3], quadColor[3], comp); /* A */
}
break;
case PIPE_BLENDFACTOR_ZERO:
@@ -436,8 +440,8 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
{
float inv_alpha[4];
VEC4_SUB(inv_alpha, one, quad->outputs.color[3]);
VEC4_MUL(source[3], quad->outputs.color[3], inv_alpha); /* A */
VEC4_SUB(inv_alpha, one, quadColor[3]);
VEC4_MUL(source[3], quadColor[3], inv_alpha); /* A */
}
break;
case PIPE_BLENDFACTOR_INV_DST_COLOR:
@@ -446,7 +450,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
{
float inv_alpha[4];
VEC4_SUB(inv_alpha, one, dest[3]);
VEC4_MUL(source[3], quad->outputs.color[3], inv_alpha); /* A */
VEC4_MUL(source[3], quadColor[3], inv_alpha); /* A */
}
break;
case PIPE_BLENDFACTOR_INV_CONST_COLOR:
@@ -456,7 +460,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
float inv_comp[4];
/* A */
VEC4_SCALAR(inv_comp, 1.0f - softpipe->blend_color.color[3]);
VEC4_MUL(source[3], quad->outputs.color[3], inv_comp);
VEC4_MUL(source[3], quadColor[3], inv_comp);
}
break;
default:
@@ -472,14 +476,14 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
/* dest = dest * 1 NO-OP, leave dest as-is */
break;
case PIPE_BLENDFACTOR_SRC_COLOR:
VEC4_MUL(dest[0], dest[0], quad->outputs.color[0]); /* R */
VEC4_MUL(dest[1], dest[1], quad->outputs.color[1]); /* G */
VEC4_MUL(dest[2], dest[2], quad->outputs.color[2]); /* B */
VEC4_MUL(dest[0], dest[0], quadColor[0]); /* R */
VEC4_MUL(dest[1], dest[1], quadColor[1]); /* G */
VEC4_MUL(dest[2], dest[2], quadColor[2]); /* B */
break;
case PIPE_BLENDFACTOR_SRC_ALPHA:
VEC4_MUL(dest[0], dest[0], quad->outputs.color[3]); /* R * A */
VEC4_MUL(dest[1], dest[1], quad->outputs.color[3]); /* G * A */
VEC4_MUL(dest[2], dest[2], quad->outputs.color[3]); /* B * A */
VEC4_MUL(dest[0], dest[0], quadColor[3]); /* R * A */
VEC4_MUL(dest[1], dest[1], quadColor[3]); /* G * A */
VEC4_MUL(dest[2], dest[2], quadColor[3]); /* B * A */
break;
case PIPE_BLENDFACTOR_DST_ALPHA:
VEC4_MUL(dest[0], dest[0], dest[3]); /* R * A */
@@ -527,18 +531,18 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_INV_SRC_COLOR:
{
float inv_comp[4];
VEC4_SUB(inv_comp, one, quad->outputs.color[0]); /* R */
VEC4_SUB(inv_comp, one, quadColor[0]); /* R */
VEC4_MUL(dest[0], inv_comp, dest[0]); /* R */
VEC4_SUB(inv_comp, one, quad->outputs.color[1]); /* G */
VEC4_SUB(inv_comp, one, quadColor[1]); /* G */
VEC4_MUL(dest[1], inv_comp, dest[1]); /* G */
VEC4_SUB(inv_comp, one, quad->outputs.color[2]); /* B */
VEC4_SUB(inv_comp, one, quadColor[2]); /* B */
VEC4_MUL(dest[2], inv_comp, dest[2]); /* B */
}
break;
case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
{
float one_minus_alpha[QUAD_SIZE];
VEC4_SUB(one_minus_alpha, one, quad->outputs.color[3]);
VEC4_SUB(one_minus_alpha, one, quadColor[3]);
VEC4_MUL(dest[0], dest[0], one_minus_alpha); /* R */
VEC4_MUL(dest[1], dest[1], one_minus_alpha); /* G */
VEC4_MUL(dest[2], dest[2], one_minus_alpha); /* B */
@@ -547,7 +551,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_INV_DST_ALPHA:
{
float inv_comp[4];
VEC4_SUB(inv_comp, one, quad->outputs.color[3]); /* A */
VEC4_SUB(inv_comp, one, quadColor[3]); /* A */
VEC4_MUL(dest[0], inv_comp, dest[0]); /* R */
VEC4_MUL(dest[1], inv_comp, dest[1]); /* G */
VEC4_MUL(dest[2], inv_comp, dest[2]); /* B */
@@ -606,7 +610,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_SRC_COLOR:
/* fall-through */
case PIPE_BLENDFACTOR_SRC_ALPHA:
VEC4_MUL(dest[3], dest[3], quad->outputs.color[3]); /* A * A */
VEC4_MUL(dest[3], dest[3], quadColor[3]); /* A * A */
break;
case PIPE_BLENDFACTOR_DST_COLOR:
/* fall-through */
@@ -633,7 +637,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
case PIPE_BLENDFACTOR_INV_SRC_ALPHA:
{
float one_minus_alpha[QUAD_SIZE];
VEC4_SUB(one_minus_alpha, one, quad->outputs.color[3]);
VEC4_SUB(one_minus_alpha, one, quadColor[3]);
VEC4_MUL(dest[3], dest[3], one_minus_alpha); /* A */
}
break;
@@ -664,29 +668,29 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
*/
switch (softpipe->blend->rgb_func) {
case PIPE_BLEND_ADD:
VEC4_ADD(quad->outputs.color[0], source[0], dest[0]); /* R */
VEC4_ADD(quad->outputs.color[1], source[1], dest[1]); /* G */
VEC4_ADD(quad->outputs.color[2], source[2], dest[2]); /* B */
VEC4_ADD(quadColor[0], source[0], dest[0]); /* R */
VEC4_ADD(quadColor[1], source[1], dest[1]); /* G */
VEC4_ADD(quadColor[2], source[2], dest[2]); /* B */
break;
case PIPE_BLEND_SUBTRACT:
VEC4_SUB(quad->outputs.color[0], source[0], dest[0]); /* R */
VEC4_SUB(quad->outputs.color[1], source[1], dest[1]); /* G */
VEC4_SUB(quad->outputs.color[2], source[2], dest[2]); /* B */
VEC4_SUB(quadColor[0], source[0], dest[0]); /* R */
VEC4_SUB(quadColor[1], source[1], dest[1]); /* G */
VEC4_SUB(quadColor[2], source[2], dest[2]); /* B */
break;
case PIPE_BLEND_REVERSE_SUBTRACT:
VEC4_SUB(quad->outputs.color[0], dest[0], source[0]); /* R */
VEC4_SUB(quad->outputs.color[1], dest[1], source[1]); /* G */
VEC4_SUB(quad->outputs.color[2], dest[2], source[2]); /* B */
VEC4_SUB(quadColor[0], dest[0], source[0]); /* R */
VEC4_SUB(quadColor[1], dest[1], source[1]); /* G */
VEC4_SUB(quadColor[2], dest[2], source[2]); /* B */
break;
case PIPE_BLEND_MIN:
VEC4_MIN(quad->outputs.color[0], source[0], dest[0]); /* R */
VEC4_MIN(quad->outputs.color[1], source[1], dest[1]); /* G */
VEC4_MIN(quad->outputs.color[2], source[2], dest[2]); /* B */
VEC4_MIN(quadColor[0], source[0], dest[0]); /* R */
VEC4_MIN(quadColor[1], source[1], dest[1]); /* G */
VEC4_MIN(quadColor[2], source[2], dest[2]); /* B */
break;
case PIPE_BLEND_MAX:
VEC4_MAX(quad->outputs.color[0], source[0], dest[0]); /* R */
VEC4_MAX(quad->outputs.color[1], source[1], dest[1]); /* G */
VEC4_MAX(quad->outputs.color[2], source[2], dest[2]); /* B */
VEC4_MAX(quadColor[0], source[0], dest[0]); /* R */
VEC4_MAX(quadColor[1], source[1], dest[1]); /* G */
VEC4_MAX(quadColor[2], source[2], dest[2]); /* B */
break;
default:
assert(0);
@@ -697,19 +701,19 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
*/
switch (softpipe->blend->alpha_func) {
case PIPE_BLEND_ADD:
VEC4_ADD(quad->outputs.color[3], source[3], dest[3]); /* A */
VEC4_ADD(quadColor[3], source[3], dest[3]); /* A */
break;
case PIPE_BLEND_SUBTRACT:
VEC4_SUB(quad->outputs.color[3], source[3], dest[3]); /* A */
VEC4_SUB(quadColor[3], source[3], dest[3]); /* A */
break;
case PIPE_BLEND_REVERSE_SUBTRACT:
VEC4_SUB(quad->outputs.color[3], dest[3], source[3]); /* A */
VEC4_SUB(quadColor[3], dest[3], source[3]); /* A */
break;
case PIPE_BLEND_MIN:
VEC4_MIN(quad->outputs.color[3], source[3], dest[3]); /* A */
VEC4_MIN(quadColor[3], source[3], dest[3]); /* A */
break;
case PIPE_BLEND_MAX:
VEC4_MAX(quad->outputs.color[3], source[3], dest[3]); /* A */
VEC4_MAX(quadColor[3], source[3], dest[3]); /* A */
break;
default:
abort();
src/mesa/pipe/softpipe/sp_quad_bufloop.c
+1 -3
View File
@@ -30,7 +30,7 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)
for (i = 0; i < softpipe->framebuffer.num_cbufs; i++) {
/* set current cbuffer */
softpipe->cbuf = softpipe->framebuffer.cbufs[i];
softpipe->current_cbuf = i;
/* pass blended quad to next stage */
qs->next->run(qs->next, quad);
@@ -38,8 +38,6 @@ cbuf_loop_quad(struct quad_stage *qs, struct quad_header *quad)
/* restore quad's colors for next buffer */
memcpy(quad->outputs.color, tmp, sizeof(tmp));
}
softpipe->cbuf = NULL; /* prevent accidental use */
}
src/mesa/pipe/softpipe/sp_quad_colormask.c
+7 -5
View File
@@ -50,7 +50,9 @@ colormask_quad(struct quad_stage *qs, struct quad_header *quad)
float dest[4][QUAD_SIZE];
struct softpipe_cached_tile *tile
= sp_get_cached_tile(softpipe,
softpipe->cbuf_cache[0], quad->x0, quad->y0);
softpipe->cbuf_cache[softpipe->current_cbuf],
quad->x0, quad->y0);
float (*quadColor)[4] = quad->outputs.color;
uint i, j;
/* get/swizzle dest colors */
@@ -64,19 +66,19 @@ colormask_quad(struct quad_stage *qs, struct quad_header *quad)
/* R */
if (!(softpipe->blend->colormask & PIPE_MASK_R))
COPY_4V(quad->outputs.color[0], dest[0]);
COPY_4V(quadColor[0], dest[0]);
/* G */
if (!(softpipe->blend->colormask & PIPE_MASK_G))
COPY_4V(quad->outputs.color[1], dest[1]);
COPY_4V(quadColor[1], dest[1]);
/* B */
if (!(softpipe->blend->colormask & PIPE_MASK_B))
COPY_4V(quad->outputs.color[2], dest[2]);
COPY_4V(quadColor[2], dest[2]);
/* A */
if (!(softpipe->blend->colormask & PIPE_MASK_A))
COPY_4V(quad->outputs.color[3], dest[3]);
COPY_4V(quadColor[3], dest[3]);
/* pass quad to next stage */
qs->next->run(qs->next, quad);
src/mesa/pipe/softpipe/sp_quad_coverage.c
+2 -1
View File
@@ -50,11 +50,12 @@ coverage_quad(struct quad_stage *qs, struct quad_header *quad)
if ((softpipe->rasterizer->poly_smooth && quad->prim == PRIM_TRI) ||
(softpipe->rasterizer->line_smooth && quad->prim == PRIM_LINE) ||
(softpipe->rasterizer->point_smooth && quad->prim == PRIM_POINT)) {
float (*quadColor)[4] = quad->outputs.color;
unsigned j;
for (j = 0; j < QUAD_SIZE; j++) {
assert(quad->coverage[j] >= 0.0);
assert(quad->coverage[j] <= 1.0);
quad->outputs.color[3][j] *= quad->coverage[j];
quadColor[3][j] *= quad->coverage[j];
}
}
src/mesa/pipe/softpipe/sp_quad_output.c
+4 -2
View File
@@ -43,11 +43,13 @@ output_quad(struct quad_stage *qs, struct quad_header *quad)
{
struct softpipe_context *softpipe = qs->softpipe;
struct softpipe_cached_tile *tile
= sp_get_cached_tile(softpipe, softpipe->cbuf_cache[0],
= sp_get_cached_tile(softpipe,
softpipe->cbuf_cache[softpipe->current_cbuf],
quad->x0, quad->y0);
/* in-tile pos: */
const int itx = quad->x0 % TILE_SIZE;
const int ity = quad->y0 % TILE_SIZE;
float (*quadColor)[4] = quad->outputs.color;
int i, j;
/* get/swizzle dest colors */
@@ -56,7 +58,7 @@ output_quad(struct quad_stage *qs, struct quad_header *quad)
int x = itx + (j & 1);
int y = ity + (j >> 1);
for (i = 0; i < 4; i++) { /* loop over color chans */
tile->data.color[y][x][i] = quad->outputs.color[i][j];
tile->data.color[y][x][i] = quadColor[i][j];
}
}
}