fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 14:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Disable C++ shading language code yet again. Doesn't compile with older

Browse source 
g++ installations.
This commit is contained in:
Brian Paul 2005-03-29 02:46:59 +00:00
parent 93b52d9484
commit 425569bbc5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/shader/shaderobjects.c
View file

@ -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
}

8
src/mesa/sources
View file

@ -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)