OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pack fragment program outputs to be consistant with vertex programs.

Browse Source 
Previously, output[0] was always Z and output[1] was color.  Now output[0]
will be color if Z is not written.
In shade_quad() use the semantic info to determine which quantity is in
which output slot.
This commit is contained in:
Brian
2007-10-09 14:55:22 -06:00
parent 342bc50c3d
commit bc139a19b0
4 changed files with 24 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/state_tracker/st_program.c
View File

@@ -160,8 +160,6 @@ st_translate_vertex_program(struct st_context *st,
defaultOutputMapping[attr] = slot;
}
vs.outputs_written |= (1 << slot);
/*
printf("Output %u -> slot %u\n", attr, slot);
*/
@@ -346,35 +344,33 @@ st_translate_fragment_program(struct st_context *st,
}
/*
* Semantics for outputs
* Semantics and mapping for outputs
*/
{
uint numColors = 0;
GLbitfield outputsWritten = stfp->Base.Base.OutputsWritten;
/* output[0] is always Z, but may not really be written */
fs.output_semantic_name[fs.num_outputs] = TGSI_SEMANTIC_POSITION;
fs.output_semantic_index[fs.num_outputs] = 0;
outputMapping[FRAG_RESULT_DEPR] = fs.num_outputs;
fs.num_outputs++;
/* if z is written, emit that first */
if (outputsWritten & (1 << FRAG_RESULT_DEPR)) {
fs.outputs_written |= 0x1;
fs.output_semantic_name[fs.num_outputs] = TGSI_SEMANTIC_POSITION;
fs.output_semantic_index[fs.num_outputs] = 0;
outputMapping[FRAG_RESULT_DEPR] = fs.num_outputs;
fs.num_outputs++;
outputsWritten &= ~(1 << FRAG_RESULT_DEPR);
}
/* color outputs begin at output [1] */
/* handle remaning outputs (color) */
for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
if (outputsWritten & (1 << attr)) {
switch (attr) {
case FRAG_RESULT_DEPR:
/* handled above */
assert(0);
break;
case FRAG_RESULT_COLR:
fs.output_semantic_name[fs.num_outputs] = TGSI_SEMANTIC_COLOR;
fs.output_semantic_index[fs.num_outputs] = numColors;
outputMapping[attr] = fs.num_outputs;
fs.outputs_written |= (0x2 << numColors);
numColors++;
break;
default: