From d9d33b6fc883ede7ef231965e0b27792c8e58299 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 31 Jan 2007 17:01:52 -0700 Subject: [PATCH] disable all x86 code, broken and will eventually be removed --- src/mesa/shader/slang/slang_assemble.c | 4 ++-- src/mesa/shader/slang/slang_assemble_assignment.c | 2 +- src/mesa/shader/slang/slang_compile.c | 5 ++--- src/mesa/shader/slang/slang_compile.h | 2 +- src/mesa/shader/slang/slang_execute.c | 6 +++--- src/mesa/shader/slang/slang_execute.h | 6 +++--- src/mesa/shader/slang/slang_execute_x86.c | 4 +++- src/mesa/shader/slang/slang_storage.c | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c index a9d2baedb92..27249078b37 100644 --- a/src/mesa/shader/slang/slang_assemble.c +++ b/src/mesa/shader/slang/slang_assemble.c @@ -481,7 +481,7 @@ dereference_basic(slang_assemble_ctx * A, slang_storage_type type, case slang_stor_float: ty = slang_asm_float_deref; break; -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ case slang_stor_vec4: ty = slang_asm_vec4_deref; break; @@ -829,7 +829,7 @@ equality_aggregate(slang_assemble_ctx * A, return GL_FALSE; } else { -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ if (arr->type == slang_stor_vec4) { if (!PLAB2(A->file, slang_asm_vec4_equal_int, size + *index, *index)) diff --git a/src/mesa/shader/slang/slang_assemble_assignment.c b/src/mesa/shader/slang/slang_assemble_assignment.c index dbcc4bcf9df..bfce04ec885 100644 --- a/src/mesa/shader/slang/slang_assemble_assignment.c +++ b/src/mesa/shader/slang/slang_assemble_assignment.c @@ -79,7 +79,7 @@ assign_basic(slang_assemble_ctx * A, slang_storage_type type, GLuint * index, case slang_stor_float: ty = slang_asm_float_copy; break; -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ case slang_stor_vec4: ty = slang_asm_vec4_copy; break; diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index 43f8a303698..65329c9db19 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -2137,8 +2137,7 @@ static const byte slang_vertex_builtin_gc[] = { #include "library/slang_vertex_builtin_gc.h" }; -#if defined(USE_X86_ASM) || defined(SLANG_X86) -foo +#if 0 /*defined(USE_X86_ASM) || defined(SLANG_X86)*/ static const byte slang_builtin_vec4_gc[] = { #include "library/slang_builtin_vec4_gc.h" }; @@ -2204,7 +2203,7 @@ compile_object(grammar * id, const char *source, slang_code_object * object, return GL_FALSE; } -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ /* compile x86 4-component vector overrides, link to target */ if (!compile_binary(slang_builtin_vec4_gc, &object->builtin[SLANG_BUILTIN_VEC4], diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/shader/slang/slang_compile.h index ba129df8e33..a8311e85465 100644 --- a/src/mesa/shader/slang/slang_compile.h +++ b/src/mesa/shader/slang/slang_compile.h @@ -70,7 +70,7 @@ _slang_code_unit_dtr (slang_code_unit *); #define SLANG_BUILTIN_COMMON 1 #define SLANG_BUILTIN_TARGET 2 -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ #define SLANG_BUILTIN_VEC4 3 #define SLANG_BUILTIN_TOTAL 4 #else diff --git a/src/mesa/shader/slang/slang_execute.c b/src/mesa/shader/slang/slang_execute.c index 09401b8910a..1561df19450 100644 --- a/src/mesa/shader/slang/slang_execute.c +++ b/src/mesa/shader/slang/slang_execute.c @@ -41,7 +41,7 @@ slang_machine_ctr(slang_machine * self) { slang_machine_init(self); self->infolog = NULL; -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ self->x86.compiled_func = NULL; #endif } @@ -53,7 +53,7 @@ slang_machine_dtr(slang_machine * self) slang_info_log_destruct(self->infolog); slang_alloc_free(self->infolog); } -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ if (self->x86.compiled_func != NULL) _mesa_exec_free(self->x86.compiled_func); #endif @@ -357,7 +357,7 @@ _slang_execute2(const slang_assembly_file * file, slang_machine * mach) f = fopen(filename, "w"); #endif -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ if (mach->x86.compiled_func != NULL) { mach->x86.compiled_func(mach); return GL_TRUE; diff --git a/src/mesa/shader/slang/slang_execute.h b/src/mesa/shader/slang/slang_execute.h index 138f1393081..1f8c3781a1d 100644 --- a/src/mesa/shader/slang/slang_execute.h +++ b/src/mesa/shader/slang/slang_execute.h @@ -46,7 +46,7 @@ typedef union slang_machine_slot_ #define SLANG_MACHINE_MEMORY_SIZE (SLANG_MACHINE_GLOBAL_SIZE + SLANG_MACHINE_STACK_SIZE) -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ /** * Extra machine state for x86 execution. */ @@ -73,7 +73,7 @@ typedef struct slang_machine_ /** Machine memory */ slang_machine_slot mem[SLANG_MACHINE_MEMORY_SIZE]; struct slang_info_log_ *infolog; /**< printMESA() support */ -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ slang_machine_x86 x86; #endif } slang_machine; @@ -92,7 +92,7 @@ extern GLboolean _slang_execute2(const slang_assembly_file *, slang_machine *); -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ extern GLboolean _slang_x86_codegen(slang_machine *, slang_assembly_file *, GLuint); #endif diff --git a/src/mesa/shader/slang/slang_execute_x86.c b/src/mesa/shader/slang/slang_execute_x86.c index 958086ff07c..c48c9667c79 100644 --- a/src/mesa/shader/slang/slang_execute_x86.c +++ b/src/mesa/shader/slang/slang_execute_x86.c @@ -34,7 +34,7 @@ #include "slang_library_noise.h" #include "slang_library_texsample.h" -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ #include "x86/rtasm/x86sse.h" @@ -353,10 +353,12 @@ codegen_assem(codegen_ctx * G, slang_assembly * a, slang_info_log ** infolog) x87_fyl2x(&G->f); x87_fstp(&G->f, x86_deref(G->r_esp)); break; +#if 00 case slang_asm_float_floor: x86_call(&G->f, (GLubyte *) do_floorf); x87_fstp(&G->f, x86_deref(G->r_esp)); break; +#endif case slang_asm_float_ceil: x86_call(&G->f, (GLubyte *) do_ceilf); x87_fstp(&G->f, x86_deref(G->r_esp)); diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/shader/slang/slang_storage.c index 71ac0692e1d..dcfb3a0e5f4 100644 --- a/src/mesa/shader/slang/slang_storage.c +++ b/src/mesa/shader/slang/slang_storage.c @@ -212,7 +212,7 @@ GLboolean _slang_aggregate_variable (slang_storage_aggregate *agg, slang_type_sp case slang_spec_vec3: return aggregate_vector (agg, slang_stor_float, 3); case slang_spec_vec4: -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ return aggregate_vector (agg, slang_stor_vec4, 1); #else return aggregate_vector (agg, slang_stor_float, 4); @@ -222,7 +222,7 @@ GLboolean _slang_aggregate_variable (slang_storage_aggregate *agg, slang_type_sp case slang_spec_mat3: return aggregate_matrix (agg, slang_stor_float, 3); case slang_spec_mat4: -#if defined(USE_X86_ASM) || defined(SLANG_X86) +#if 0/*defined(USE_X86_ASM) || defined(SLANG_X86)*/ return aggregate_vector (agg, slang_stor_vec4, 4); #else return aggregate_matrix (agg, slang_stor_float, 4); -- 2.30.2