diff options
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index 0173bc4a7fc..a4d3b750c3c 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -76,7 +76,7 @@ struct lp_tgsi_channel_info union { uint32_t index; float value; /* for TGSI_FILE_IMMEDIATE */ - }; + } u; }; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c index eab72b8eb7d..d1f82610025 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c @@ -74,10 +74,10 @@ analyse_src(struct analysis_context *ctx, if (src->File == TGSI_FILE_IMMEDIATE) { assert(src->Index < Elements(ctx->imm)); if (src->Index < Elements(ctx->imm)) { - chan_info->value = ctx->imm[src->Index][swizzle]; + chan_info->u.value = ctx->imm[src->Index][swizzle]; } } else { - chan_info->index = src->Index; + chan_info->u.index = src->Index; chan_info->swizzle = swizzle; } } @@ -92,7 +92,7 @@ static boolean is_immediate(const struct lp_tgsi_channel_info *chan_info, float value) { return chan_info->file == TGSI_FILE_IMMEDIATE && - chan_info->value == value; + chan_info->u.value == value; } @@ -342,7 +342,7 @@ dump_info(const struct tgsi_token *tokens, if (chan_info->file != TGSI_FILE_NULL) { debug_printf(" %s[%u].%c", tgsi_file_names[chan_info->file], - chan_info->index, + chan_info->u.index, "xyzw01"[chan_info->swizzle]); } else { debug_printf(" _"); @@ -360,7 +360,7 @@ dump_info(const struct tgsi_token *tokens, if (chan_info->file != TGSI_FILE_NULL) { debug_printf("OUT[%u].%c = ", index, "xyzw"[chan]); if (chan_info->file == TGSI_FILE_IMMEDIATE) { - debug_printf("%f", chan_info->value); + debug_printf("%f", chan_info->u.value); } else { const char *file_name; switch (chan_info->file) { @@ -376,7 +376,7 @@ dump_info(const struct tgsi_token *tokens, } debug_printf("%s[%u].%c", file_name, - chan_info->index, + chan_info->u.index, "xyzw01"[chan_info->swizzle]); } debug_printf("\n"); |