diff options
| -rw-r--r-- | src/mesa/shader/shaderobjects.c | 2 | ||||
| -rw-r--r-- | src/mesa/sources | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c index ac8ff1af487..490794170d4 100644 --- a/src/mesa/shader/shaderobjects.c +++ b/src/mesa/shader/shaderobjects.c @@ -1177,6 +1177,8 @@ _mesa_init_shaderobjects (GLcontext *ctx) { ctx->ShaderObjects.current_program = NULL; +#if 0 /* disable for now */ _mesa_init_shaderobjects_3dlabs (ctx); +#endif } diff --git a/src/mesa/sources b/src/mesa/sources index 57059a5ae3a..b2f19cc00bb 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -149,8 +149,9 @@ SHADER_SOURCES = \ shader/nvvertexec.c \ shader/nvvertparse.c \ shader/program.c \ - shader/shaderobjects.c \ - shader/shaderobjects_3dlabs.c + shader/shaderobjects.c + +# shader/shaderobjects_3dlabs.c SLANG_SOURCES = \ shader/slang/MachineIndependent/preprocessor/atom.c \ @@ -276,7 +277,8 @@ CORE_SOURCES = \ ### Object files -CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o) +#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o) +CORE_OBJECTS = $(CORE_SOURCES:.c=.o) OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o) |