From a5e032853a8bac8895fab6fe88ba8a1a692121a6 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 27 Apr 2010 21:49:32 +0100 Subject: gallium: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes. Arcane DX9 opcodes that never were emitted by Mesa and have no DX10 counterpart. Slated for removal for quite some time now. --- src/gallium/include/pipe/p_shader_tokens.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gallium/include') diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index c5c480f1f0..e21aaacc18 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -276,12 +276,10 @@ struct tgsi_property_data { #define TGSI_OPCODE_TXL 72 #define TGSI_OPCODE_BRK 73 #define TGSI_OPCODE_IF 74 -#define TGSI_OPCODE_BGNFOR 75 -#define TGSI_OPCODE_REP 76 + /* gap */ #define TGSI_OPCODE_ELSE 77 #define TGSI_OPCODE_ENDIF 78 -#define TGSI_OPCODE_ENDFOR 79 -#define TGSI_OPCODE_ENDREP 80 + /* gap */ #define TGSI_OPCODE_PUSHA 81 #define TGSI_OPCODE_POPA 82 #define TGSI_OPCODE_CEIL 83 -- cgit v1.2.3 From 347f783606052a467f32bfcf69fbee67e031d24d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 27 Apr 2010 16:42:13 -0600 Subject: gallium: remove trailing comma --- src/gallium/include/pipe/p_defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/include') diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 48edfbfcce..1aa54f1423 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -269,7 +269,7 @@ enum pipe_transfer_usage { * - pipe_context::transfer_flush_region * - OpenGL's ARB_map_buffer_range extension, MAP_FLUSH_EXPLICIT_BIT flag. */ - PIPE_TRANSFER_FLUSH_EXPLICIT = (1 << 11), + PIPE_TRANSFER_FLUSH_EXPLICIT = (1 << 11) }; -- cgit v1.2.3