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

llvmpipe: adapt to blend changes

Browse Source
This commit is contained in:
Roland Scheidegger
2010-01-25 16:35:56 +01:00
parent 3770769f21
commit 99e28d4ee3
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/llvmpipe/lp_test_blend.c
+37 -35
View File
@@ -104,18 +104,18 @@ write_tsv_row(FILE *fp,
fprintf(fp,
"%s\t%s\t%s\t",
blend->rgb_func != blend->alpha_func ? "true" : "false",
blend->rgb_src_factor != blend->alpha_src_factor ? "true" : "false",
blend->rgb_dst_factor != blend->alpha_dst_factor ? "true" : "false");
blend->rt[0].rgb_func != blend->rt[0].alpha_func ? "true" : "false",
blend->rt[0].rgb_src_factor != blend->rt[0].alpha_src_factor ? "true" : "false",
blend->rt[0].rgb_dst_factor != blend->rt[0].alpha_dst_factor ? "true" : "false");
fprintf(fp,
"%s\t%s\t%s\t%s\t%s\t%s\n",
debug_dump_blend_func(blend->rgb_func, TRUE),
debug_dump_blend_factor(blend->rgb_src_factor, TRUE),
debug_dump_blend_factor(blend->rgb_dst_factor, TRUE),
debug_dump_blend_func(blend->alpha_func, TRUE),
debug_dump_blend_factor(blend->alpha_src_factor, TRUE),
debug_dump_blend_factor(blend->alpha_dst_factor, TRUE));
debug_dump_blend_func(blend->rt[0].rgb_func, TRUE),
debug_dump_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
debug_dump_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
debug_dump_blend_func(blend->rt[0].alpha_func, TRUE),
debug_dump_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
debug_dump_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
fflush(fp);
}
@@ -137,12 +137,12 @@ dump_blend_type(FILE *fp,
fprintf(fp,
" %s=%s %s=%s %s=%s %s=%s %s=%s %s=%s",
"rgb_func", debug_dump_blend_func(blend->rgb_func, TRUE),
"rgb_src_factor", debug_dump_blend_factor(blend->rgb_src_factor, TRUE),
"rgb_dst_factor", debug_dump_blend_factor(blend->rgb_dst_factor, TRUE),
"alpha_func", debug_dump_blend_func(blend->alpha_func, TRUE),
"alpha_src_factor", debug_dump_blend_factor(blend->alpha_src_factor, TRUE),
"alpha_dst_factor", debug_dump_blend_factor(blend->alpha_dst_factor, TRUE));
"rgb_func", debug_dump_blend_func(blend->rt[0].rgb_func, TRUE),
"rgb_src_factor", debug_dump_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
"rgb_dst_factor", debug_dump_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
"alpha_func", debug_dump_blend_func(blend->rt[0].alpha_func, TRUE),
"alpha_src_factor", debug_dump_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
"alpha_dst_factor", debug_dump_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
fprintf(fp, " ...\n");
fflush(fp);
@@ -401,13 +401,15 @@ compute_blend_ref(const struct pipe_blend_state *blend,
double src_term[4];
double dst_term[4];
compute_blend_ref_term(blend->rgb_src_factor, blend->alpha_src_factor, src, src, dst, con, src_term);
compute_blend_ref_term(blend->rgb_dst_factor, blend->alpha_dst_factor, dst, src, dst, con, dst_term);
compute_blend_ref_term(blend->rt[0].rgb_src_factor, blend->rt[0].alpha_src_factor,
src, src, dst, con, src_term);
compute_blend_ref_term(blend->rt[0].rgb_dst_factor, blend->rt[0].alpha_dst_factor,
dst, src, dst, con, dst_term);
/*
* Combine RGB terms
*/
switch (blend->rgb_func) {
switch (blend->rt[0].rgb_func) {
case PIPE_BLEND_ADD:
ADD_SAT(res[0], src_term[0], dst_term[0]); /* R */
ADD_SAT(res[1], src_term[1], dst_term[1]); /* G */
@@ -440,7 +442,7 @@ compute_blend_ref(const struct pipe_blend_state *blend,
/*
* Combine A terms
*/
switch (blend->alpha_func) {
switch (blend->rt[0].alpha_func) {
case PIPE_BLEND_ADD:
ADD_SAT(res[3], src_term[3], dst_term[3]); /* A */
break;
@@ -806,14 +808,14 @@ test_all(unsigned verbose, FILE *fp)
continue;
memset(&blend, 0, sizeof blend);
blend.blend_enable = 1;
blend.rgb_func = *rgb_func;
blend.rgb_src_factor = *rgb_src_factor;
blend.rgb_dst_factor = *rgb_dst_factor;
blend.alpha_func = *alpha_func;
blend.alpha_src_factor = *alpha_src_factor;
blend.alpha_dst_factor = *alpha_dst_factor;
blend.colormask = PIPE_MASK_RGBA;
blend.rt[0].blend_enable = 1;
blend.rt[0].rgb_func = *rgb_func;
blend.rt[0].rgb_src_factor = *rgb_src_factor;
blend.rt[0].rgb_dst_factor = *rgb_dst_factor;
blend.rt[0].alpha_func = *alpha_func;
blend.rt[0].alpha_src_factor = *alpha_src_factor;
blend.rt[0].alpha_dst_factor = *alpha_dst_factor;
blend.rt[0].colormask = PIPE_MASK_RGBA;
if(!test_one(verbose, fp, &blend, mode, *type))
success = FALSE;
@@ -865,14 +867,14 @@ test_some(unsigned verbose, FILE *fp, unsigned long n)
type = &blend_types[rand() % num_types];
memset(&blend, 0, sizeof blend);
blend.blend_enable = 1;
blend.rgb_func = *rgb_func;
blend.rgb_src_factor = *rgb_src_factor;
blend.rgb_dst_factor = *rgb_dst_factor;
blend.alpha_func = *alpha_func;
blend.alpha_src_factor = *alpha_src_factor;
blend.alpha_dst_factor = *alpha_dst_factor;
blend.colormask = PIPE_MASK_RGBA;
blend.rt[0].blend_enable = 1;
blend.rt[0].rgb_func = *rgb_func;
blend.rt[0].rgb_src_factor = *rgb_src_factor;
blend.rt[0].rgb_dst_factor = *rgb_dst_factor;
blend.rt[0].alpha_func = *alpha_func;
blend.rt[0].alpha_src_factor = *alpha_src_factor;
blend.rt[0].alpha_dst_factor = *alpha_dst_factor;
blend.rt[0].colormask = PIPE_MASK_RGBA;
if(!test_one(verbose, fp, &blend, mode, *type))
success = FALSE;