summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-02 11:49:43 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-02 11:49:43 -0600
commite2009d0871ac230e4b0c84a23eabef4cd37d81e2 (patch)
treefcb41c3bb0a64500aee93f9dce5a3c2f8224e6d0
parent9ac03856f563e0e830f6cdeef321875682f79943 (diff)
no more need for tgsi_exec_machine_run2(), remove dead code
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_exec.c56
-rw-r--r--src/mesa/pipe/tgsi/exec/tgsi_exec.h4
2 files changed, 1 insertions, 59 deletions
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index 1c515a26e3..6b33914c15 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -250,15 +250,6 @@ tgsi_exec_prepare(
tgsi_parse_free (&parse);
}
-void
-tgsi_exec_machine_run(
- struct tgsi_exec_machine *mach )
-{
-#if 0
- tgsi_exec_prepare( mach );
-#endif
- tgsi_exec_machine_run2( mach );
-}
static void
micro_abs(
@@ -2261,27 +2252,11 @@ exec_instruction(
void
-tgsi_exec_machine_run2(
- struct tgsi_exec_machine *mach )
+tgsi_exec_machine_run( struct tgsi_exec_machine *mach )
{
-#if 0 && MESA
- GET_CURRENT_CONTEXT(ctx);
- GLuint i;
-#endif
-
#if XXX_SSE
mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] = 0;
#else
-#if 0
- struct tgsi_parse_context parse;
- GLuint k;
-#endif
-
-#if 0
- if (!mach->Instructions) {
- expand_program(mach);
- }
-#endif
mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] = 0;
mach->Temps[TEMP_OUTPUT_I].xyzw[TEMP_OUTPUT_C].u[0] = 0;
@@ -2292,29 +2267,6 @@ tgsi_exec_machine_run2(
}
-#if 0
- k = tgsi_parse_init( &parse, mach->Tokens );
- if (k != TGSI_PARSE_OK) {
- printf("Problem parsing!\n");
- return;
- }
- while( !tgsi_parse_end_of_tokens( &parse ) ) {
- tgsi_parse_token( &parse );
- switch( parse.FullToken.Token.Type ) {
- case TGSI_TOKEN_TYPE_DECLARATION:
- exec_declaration( mach, &parse.FullToken.FullDeclaration );
- break;
- case TGSI_TOKEN_TYPE_IMMEDIATE:
- break;
- case TGSI_TOKEN_TYPE_INSTRUCTION:
- exec_instruction( mach, &parse.FullToken.FullInstruction, labels, &parse.Position );
- break;
- default:
- assert( 0 );
- }
- }
- tgsi_parse_free (&parse);
-#else
{
uint i;
int pc;
@@ -2328,13 +2280,7 @@ tgsi_exec_machine_run2(
while (pc != 99 && pc < mach->NumInstructions) {
exec_instruction( mach, mach->Instructions + pc, &pc );
}
-
-#if 0
- free(mach->Declarations);
- free(mach->Instructions);
-#endif
}
-#endif
#endif
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
index 2b493ff682..cf298b7c65 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
@@ -174,10 +174,6 @@ void
tgsi_exec_machine_run(
struct tgsi_exec_machine *mach );
-void
-tgsi_exec_machine_run2(
- struct tgsi_exec_machine *mach );
-
#if defined __cplusplus
} // extern "C"
#endif // defined __cplusplus