diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:31:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:31:14 +0000 |
| commit | 87eec80c1120d2cd9749ee360b77922feabf7f10 (patch) | |
| tree | e60d852329b2d8b981dcc1928a6f8d1a2254e120 /src/gallium/auxiliary/tgsi/tgsi_transform.c | |
| parent | 06d3732a9094030fc33120f16f162e0d405f132c (diff) | |
| parent | 5285de7c0fc067dc036a5b421140a696ce2cabbf (diff) | |
Merge commit 'origin/tgsi-simplify-ext'
Conflicts:
src/gallium/drivers/r300/r300_vs.c
Diffstat (limited to 'src/gallium/auxiliary/tgsi/tgsi_transform.c')
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_transform.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_transform.c b/src/gallium/auxiliary/tgsi/tgsi_transform.c index bc9c18fd4a..8b8f489b35 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_transform.c +++ b/src/gallium/auxiliary/tgsi/tgsi_transform.c @@ -130,15 +130,13 @@ tgsi_transform_shader(const struct tgsi_token *tokens_in, /** ** Setup output shader **/ - *(struct tgsi_version *) &tokens_out[0] = tgsi_build_version(); - - ctx->header = (struct tgsi_header *) (tokens_out + 1); + ctx->header = (struct tgsi_header *)tokens_out; *ctx->header = tgsi_build_header(); - processor = (struct tgsi_processor *) (tokens_out + 2); + processor = (struct tgsi_processor *) (tokens_out + 1); *processor = tgsi_build_processor( procType, ctx->header ); - ctx->ti = 3; + ctx->ti = 2; /** @@ -215,7 +213,7 @@ tgsi_transform_foo( struct tgsi_token *tokens_out, uint max_tokens_out ) { const char *text = - "FRAG1.1\n" + "FRAG\n" "DCL IN[0], COLOR, CONSTANT\n" "DCL OUT[0], COLOR\n" " 0: MOV OUT[0], IN[0]\n" |