diff options
| author | Roland Scheidegger <[email protected]> | 2010-05-04 15:58:29 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-05-04 15:58:29 +0200 |
| commit | 0ae2f59c0287f4baec6c7de5f2f0fdf736fba26d (patch) | |
| tree | ee14bf3e8bba80649541c4e13fc07c60baf6c248 /src/gallium/include | |
| parent | 7662e3519bef3802024da3050b886068281e02b1 (diff) | |
| parent | 1c920c61764b17fd9fb4a89d2db7355fbe1d7565 (diff) | |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index e21aaacc18a..0a70237f260 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -73,9 +73,8 @@ enum tgsi_file_type { TGSI_FILE_SAMPLER =5, TGSI_FILE_ADDRESS =6, TGSI_FILE_IMMEDIATE =7, - TGSI_FILE_LOOP =8, - TGSI_FILE_PREDICATE =9, - TGSI_FILE_SYSTEM_VALUE =10, + TGSI_FILE_PREDICATE =8, + TGSI_FILE_SYSTEM_VALUE =9, TGSI_FILE_COUNT /**< how many TGSI_FILE_ types */ }; |