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/state_trackers/vega/shaders_cache.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/state_trackers/vega/shaders_cache.c')
| -rw-r--r-- | src/gallium/state_trackers/vega/shaders_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/vega/shaders_cache.c b/src/gallium/state_trackers/vega/shaders_cache.c index fd0831fab1..f620075d0b 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.c +++ b/src/gallium/state_trackers/vega/shaders_cache.c @@ -97,7 +97,7 @@ static INLINE struct tgsi_token *tokens_from_assembly(const char *txt, int num_t /* static const char max_shader_preamble[] = - "FRAG1.1\n" + "FRAG\n" "DCL IN[0], POSITION, LINEAR\n" "DCL IN[1], GENERIC[0], PERSPECTIVE\n" "DCL OUT[0], COLOR, CONSTANT\n" @@ -168,7 +168,7 @@ create_preamble(char *txt, --end_temp; --end_sampler; - sprintf(txt, "FRAG1.1\n"); + sprintf(txt, "FRAG\n"); if (declare_input) { sprintf(txt + strlen(txt), "DCL IN[0], POSITION, LINEAR\n"); |