fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 03:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tgsi: fix some off-by-one errors in shader length, instruction length

Browse source 
The ureg and/or tgsi-simplification work introduced some inconsistencies
between the ureg and traditional TGSI construction code.

Now the tgsi_instruction::NrTokens field is consistant and the
tgsi_header::BodySize field isn't off by one.

Fixes bug 25455.
This commit is contained in:
Brian Paul 2009-12-07 14:12:28 -07:00
parent 629a648b05
commit bc7567d966
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/tgsi/tgsi_build.c
View file

@ -399,7 +399,7 @@ tgsi_default_instruction( void )
struct tgsi_instruction instruction;
instruction.Type = TGSI_TOKEN_TYPE_INSTRUCTION;
instruction.NrTokens = 1;
instruction.NrTokens = 0;
instruction.Opcode = TGSI_OPCODE_MOV;
instruction.Saturate = TGSI_SAT_NONE;
instruction.Predicate = 0;

5
src/gallium/auxiliary/tgsi/tgsi_parse.c
View file

@ -60,7 +60,7 @@ tgsi_parse_end_of_tokens(
struct tgsi_parse_context *ctx )
{
return ctx->Position >=
1 + ctx->FullHeader.Header.HeaderSize + ctx->FullHeader.Header.BodySize;
ctx->FullHeader.Header.HeaderSize + ctx->FullHeader.Header.BodySize;
}
@ -232,8 +232,7 @@ tgsi_num_tokens(const struct tgsi_token *tokens)
struct tgsi_parse_context ctx;
if (tgsi_parse_init(&ctx, tokens) == TGSI_PARSE_OK) {
unsigned len = (ctx.FullHeader.Header.HeaderSize +
ctx.FullHeader.Header.BodySize +
1);
ctx.FullHeader.Header.BodySize);
return len;
}
return 0;

2
src/gallium/auxiliary/tgsi/tgsi_ureg.c
View file

@ -1053,7 +1053,7 @@ fixup_header_size(struct ureg_program *ureg)
{
union tgsi_any_token *out = retrieve_token( ureg, DOMAIN_DECL, 0 );
out->header.BodySize = ureg->domain[DOMAIN_DECL].count - 3;
out->header.BodySize = ureg->domain[DOMAIN_DECL].count - 2;
}