summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/swr/swr_shader.cpp
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2016-11-09 21:04:01 -0500
committerIlia Mirkin <[email protected]>2016-11-22 20:27:20 -0500
commit6d6ef3fb5594393affab264c9c51570475b7b470 (patch)
tree0bf5a1035a9bfb4aa1e828c143649ae6fbec0d66 /src/gallium/drivers/swr/swr_shader.cpp
parent2595aebd91956cbe47d2805d8c7beac2d9de7fa8 (diff)
swr: rework vert <-> frag shader linkage logic
Fixes a few things: - sprite coords only apply to generic varyings, and are a bitmask - back color only applies in 2-sided lighting mode - handle some odd situations between only some front/back colors being there. This is only semi-legal in GL, but we shouldn't start crashing. Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Tim Rowley <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/swr_shader.cpp')
-rw-r--r--src/gallium/drivers/swr/swr_shader.cpp93
1 files changed, 50 insertions, 43 deletions
diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp
index 2f7223900d3..d29f6351443 100644
--- a/src/gallium/drivers/swr/swr_shader.cpp
+++ b/src/gallium/drivers/swr/swr_shader.cpp
@@ -372,15 +372,6 @@ locate_linkage(ubyte name, ubyte index, struct tgsi_shader_info *info)
}
}
- if (name == TGSI_SEMANTIC_COLOR) { // BCOLOR fallback
- for (int i = 0; i < PIPE_MAX_SHADER_OUTPUTS; i++) {
- if ((info->output_semantic_name[i] == TGSI_SEMANTIC_BCOLOR)
- && (info->output_semantic_index[i] == index)) {
- return i - 1; // position is not part of the linkage
- }
- }
- }
-
return 0xFFFFFFFF;
}
@@ -523,54 +514,70 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key)
unsigned linkedAttrib =
locate_linkage(semantic_name, semantic_idx, &ctx->vs->info.base);
- if (linkedAttrib == 0xFFFFFFFF) {
- // not found - check for point sprite
- if (ctx->rasterizer->sprite_coord_enable) {
- linkedAttrib = ctx->vs->info.base.num_outputs - 1;
- swr_fs->pointSpriteMask |= (1 << linkedAttrib);
- } else {
- fprintf(stderr,
- "Missing %s[%d]\n",
- tgsi_semantic_names[semantic_name],
- semantic_idx);
- assert(0 && "attribute linkage not found");
+ if (semantic_name == TGSI_SEMANTIC_GENERIC &&
+ ctx->rasterizer->sprite_coord_enable & (1 << semantic_idx)) {
+ /* we add an extra attrib to the backendState in swr_update_derived. */
+ linkedAttrib = ctx->vs->info.base.num_outputs - 1;
+ swr_fs->pointSpriteMask |= (1 << linkedAttrib);
+ } else if (linkedAttrib == 0xFFFFFFFF) {
+ inputs[attrib][0] = wrap(VIMMED1(0.0f));
+ inputs[attrib][1] = wrap(VIMMED1(0.0f));
+ inputs[attrib][2] = wrap(VIMMED1(0.0f));
+ inputs[attrib][3] = wrap(VIMMED1(1.0f));
+ /* If we're reading in color and 2-sided lighting is enabled, we have
+ * to keep going.
+ */
+ if (semantic_name != TGSI_SEMANTIC_COLOR || !key.light_twoside)
+ continue;
+ } else {
+ if (interpMode == TGSI_INTERPOLATE_CONSTANT) {
+ swr_fs->constantMask |= 1 << linkedAttrib;
+ } else if (interpMode == TGSI_INTERPOLATE_COLOR) {
+ swr_fs->flatConstantMask |= 1 << linkedAttrib;
}
}
- if (interpMode == TGSI_INTERPOLATE_CONSTANT) {
- swr_fs->constantMask |= 1 << linkedAttrib;
- } else if (interpMode == TGSI_INTERPOLATE_COLOR) {
- swr_fs->flatConstantMask |= 1 << linkedAttrib;
- }
-
- for (int channel = 0; channel < TGSI_NUM_CHANNELS; channel++) {
- if (mask & (1 << channel)) {
- Value *indexA = C(linkedAttrib * 12 + channel);
- Value *indexB = C(linkedAttrib * 12 + channel + 4);
- Value *indexC = C(linkedAttrib * 12 + channel + 8);
+ unsigned bcolorAttrib = 0xFFFFFFFF;
+ Value *offset = NULL;
+ if (semantic_name == TGSI_SEMANTIC_COLOR && key.light_twoside) {
+ bcolorAttrib = locate_linkage(
+ TGSI_SEMANTIC_BCOLOR, semantic_idx, &ctx->vs->info.base);
+ /* Neither front nor back colors were available. Nothing to load. */
+ if (bcolorAttrib == 0xFFFFFFFF && linkedAttrib == 0xFFFFFFFF)
+ continue;
+ /* If there is no front color, just always use the back color. */
+ if (linkedAttrib == 0xFFFFFFFF)
+ linkedAttrib = bcolorAttrib;
- if ((semantic_name == TGSI_SEMANTIC_COLOR)
- && ctx->rasterizer->light_twoside) {
- unsigned bcolorAttrib = locate_linkage(
- TGSI_SEMANTIC_BCOLOR, semantic_idx, &ctx->vs->info.base);
+ if (bcolorAttrib != 0xFFFFFFFF) {
+ if (interpMode == TGSI_INTERPOLATE_CONSTANT) {
+ swr_fs->constantMask |= 1 << bcolorAttrib;
+ } else if (interpMode == TGSI_INTERPOLATE_COLOR) {
+ swr_fs->flatConstantMask |= 1 << bcolorAttrib;
+ }
- unsigned diff = 12 * (bcolorAttrib - linkedAttrib);
+ unsigned diff = 12 * (bcolorAttrib - linkedAttrib);
+ if (diff) {
Value *back =
XOR(C(1), LOAD(pPS, {0, SWR_PS_CONTEXT_frontFace}), "backFace");
- Value *offset = MUL(back, C(diff));
+ offset = MUL(back, C(diff));
offset->setName("offset");
+ }
+ }
+ }
+ for (int channel = 0; channel < TGSI_NUM_CHANNELS; channel++) {
+ if (mask & (1 << channel)) {
+ Value *indexA = C(linkedAttrib * 12 + channel);
+ Value *indexB = C(linkedAttrib * 12 + channel + 4);
+ Value *indexC = C(linkedAttrib * 12 + channel + 8);
+
+ if (offset) {
indexA = ADD(indexA, offset);
indexB = ADD(indexB, offset);
indexC = ADD(indexC, offset);
-
- if (interpMode == TGSI_INTERPOLATE_CONSTANT) {
- swr_fs->constantMask |= 1 << bcolorAttrib;
- } else if (interpMode == TGSI_INTERPOLATE_COLOR) {
- swr_fs->flatConstantMask |= 1 << bcolorAttrib;
- }
}
Value *va = VBROADCAST(LOAD(GEP(pAttribs, indexA)));