MAIN_SOURCES = \
main/api_arrayelt.c \
+ main/api_exec.c \
main/api_loopback.c \
main/api_noop.c \
main/api_validate.c \
main/blend.c \
main/bufferobj.c \
main/buffers.c \
+ main/clear.c \
main/clip.c \
main/colortab.c \
main/context.c \
main/extensions.c \
main/fbobject.c \
main/feedback.c \
+ main/ffvertex_prog.c \
main/fog.c \
main/framebuffer.c \
main/get.c \
main/matrix.c \
main/mipmap.c \
main/mm.c \
- main/occlude.c \
main/pixel.c \
+ main/pixelstore.c \
main/points.c \
main/polygon.c \
+ main/queryobj.c \
main/rastpos.c \
main/rbadaptors.c \
+ main/readpix.c \
main/renderbuffer.c \
+ main/scissor.c \
main/shaders.c \
main/state.c \
main/stencil.c \
math/m_vector.c \
math/m_xform.c
-ARRAY_CACHE_SOURCES = \
- array_cache/ac_context.c \
- array_cache/ac_import.c
-
SWRAST_SOURCES = \
swrast/s_aaline.c \
swrast/s_aatriangle.c \
swrast_setup/ss_triangle.c
TNL_SOURCES = \
- tnl/t_array_api.c \
- tnl/t_array_import.c \
tnl/t_context.c \
tnl/t_pipeline.c \
- tnl/t_save_api.c \
- tnl/t_save_loopback.c \
- tnl/t_save_playback.c \
- tnl/t_vb_arbprogram.c \
- tnl/t_vb_arbprogram_sse.c \
+ tnl/t_draw.c \
+ tnl/t_rasterpos.c \
tnl/t_vb_program.c \
tnl/t_vb_render.c \
tnl/t_vb_texgen.c \
tnl/t_vp_build.c \
tnl/t_vertex.c \
tnl/t_vertex_sse.c \
- tnl/t_vertex_generic.c \
- tnl/t_vtx_api.c \
- tnl/t_vtx_generic.c \
- tnl/t_vtx_x86.c \
- tnl/t_vtx_eval.c \
- tnl/t_vtx_exec.c
+ tnl/t_vertex_generic.c
+
+VBO_SOURCES = \
+ vbo/vbo_context.c \
+ vbo/vbo_exec.c \
+ vbo/vbo_exec_api.c \
+ vbo/vbo_exec_array.c \
+ vbo/vbo_exec_draw.c \
+ vbo/vbo_exec_eval.c \
+ vbo/vbo_rebase.c \
+ vbo/vbo_split.c \
+ vbo/vbo_split_copy.c \
+ vbo/vbo_split_inplace.c \
+ vbo/vbo_save.c \
+ vbo/vbo_save_api.c \
+ vbo/vbo_save_draw.c \
+ vbo/vbo_save_loopback.c
+
SHADER_SOURCES = \
shader/arbprogparse.c \
shader/grammar/grammar_mesa.c \
shader/nvfragparse.c \
shader/nvprogram.c \
- shader/nvvertexec.c \
shader/nvvertparse.c \
shader/program.c \
+ shader/prog_cache.c \
+ shader/prog_debug.c \
+ shader/prog_execute.c \
shader/prog_instruction.c \
shader/prog_parameter.c \
shader/prog_print.c \
shader/prog_statevars.c \
+ shader/prog_uniform.c \
shader/programopt.c \
shader/shader_api.c \
SLANG_SOURCES = \
- shader/slang/slang_analyse.c \
- shader/slang/slang_assemble.c \
- shader/slang/slang_assemble_assignment.c \
- shader/slang/slang_assemble_conditional.c \
- shader/slang/slang_assemble_constructor.c \
- shader/slang/slang_assemble_typeinfo.c \
+ shader/slang/slang_builtin.c \
shader/slang/slang_codegen.c \
shader/slang/slang_compile.c \
shader/slang/slang_compile_function.c \
shader/slang/slang_compile_struct.c \
shader/slang/slang_compile_variable.c \
shader/slang/slang_emit.c \
- shader/slang/slang_error.c \
- shader/slang/slang_execute.c \
- shader/slang/slang_export.c \
+ shader/slang/slang_ir.c \
+ shader/slang/slang_label.c \
shader/slang/slang_library_noise.c \
- shader/slang/slang_library_texsample.c \
shader/slang/slang_link.c \
- shader/slang/slang_link2.c \
+ shader/slang/slang_log.c \
+ shader/slang/slang_mem.c \
shader/slang/slang_preprocess.c \
+ shader/slang/slang_print.c \
shader/slang/slang_simplify.c \
shader/slang/slang_storage.c \
+ shader/slang/slang_typeinfo.c \
shader/slang/slang_vartable.c \
- shader/slang/slang_print.c \
shader/slang/slang_utility.c
ASM_C_SOURCES = \
x86/rtasm/x86sse.c \
sparc/sparc.c \
ppc/common_ppc.c \
- x86-64/x86-64.c \
- shader/slang/slang_execute_x86.c
+ x86-64/x86-64.c
X86_SOURCES = \
x86/common_x86_asm.S \
x86/sse_xform3.S \
x86/sse_xform4.S \
x86/sse_normal.S \
- x86/read_rgba_span_x86.S \
- tnl/t_vtx_x86_gcc.S
+ x86/read_rgba_span_x86.S
X86_API = \
x86/glapi_x86.S
COMMON_DRIVER_SOURCES = \
drivers/common/driverfuncs.c
-X11_DRIVER_SOURCES = \
- drivers/x11/glxapi.c \
- drivers/x11/fakeglx.c \
- drivers/x11/xfonts.c \
- drivers/x11/xm_api.c \
- drivers/x11/xm_buffer.c \
- drivers/x11/xm_dd.c \
- drivers/x11/xm_line.c \
- drivers/x11/xm_span.c \
- drivers/x11/xm_tri.c
-
-OSMESA_DRIVER_SOURCES = \
- drivers/osmesa/osmesa.c
-
-GLIDE_DRIVER_SOURCES = \
- drivers/glide/fxapi.c \
- drivers/glide/fxdd.c \
- drivers/glide/fxddspan.c \
- drivers/glide/fxddtex.c \
- drivers/glide/fxsetup.c \
- drivers/glide/fxtexman.c \
- drivers/glide/fxtris.c \
- drivers/glide/fxvb.c \
- drivers/glide/fxglidew.c \
- drivers/glide/fxg.c
-
-SVGA_DRIVER_SOURCES = \
- drivers/svga/svgamesa.c \
- drivers/svga/svgamesa8.c \
- drivers/svga/svgamesa15.c \
- drivers/svga/svgamesa16.c \
- drivers/svga/svgamesa24.c \
- drivers/svga/svgamesa32.c
-
-FBDEV_DRIVER_SOURCES = \
- drivers/fbdev/glfbdev.c
### All the core C sources
-ALL_SOURCES = \
- $(GLAPI_SOURCES) \
- $(SOLO_SOURCES) \
- $(ASM_SOURCES) \
- $(COMMON_DRIVER_SOURCES)\
- $(X11_DRIVER_SOURCES) \
- $(FBDEV_DRIVER_SOURCES) \
- $(OSMESA_DRIVER_SOURCES)
-
-SOLO_SOURCES = \
+MESA_SOURCES = \
$(MAIN_SOURCES) \
$(MATH_SOURCES) \
- $(ARRAY_CACHE_SOURCES) \
+ $(VBO_SOURCES) \
$(TNL_SOURCES) \
$(SHADER_SOURCES) \
$(SWRAST_SOURCES) \
$(SWRAST_SETUP_SOURCES) \
+ $(COMMON_DRIVER_SOURCES) \
$(ASM_C_SOURCES) \
$(SLANG_SOURCES)
-CORE_SOURCES = \
+ALL_SOURCES = \
+ $(MESA_SOURCES) \
$(GLAPI_SOURCES) \
- $(SOLO_SOURCES)
+ $(ASM_SOURCES) \
+ $(COMMON_DRIVER_SOURCES)
+
### Object files
-SOLO_OBJECTS = \
- $(SOLO_SOURCES:.c=.o) \
+MESA_OBJECTS = \
+ $(MESA_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o)
GLAPI_OBJECTS = \
$(GLAPI_SOURCES:.c=.o) \
$(ASM_API:.S=.o)
-CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
-
-OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)
COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
-FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o)
-
### Include directories
+### XXX we should be able to trim this down to just -Iinclude/ and -Isrc/mesa/
+### since most #includes have been changed from #include "mtypes.h" to
+### #include "main/mtypes.h", etc.
INCLUDE_DIRS = \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/main \
- -I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/math \
- -I$(TOP)/src/mesa/tnl \
- -I$(TOP)/src/mesa/shader \
- -I$(TOP)/src/mesa/shader/grammar \
- -I$(TOP)/src/mesa/shader/slang \
- -I$(TOP)/src/mesa/swrast \
- -I$(TOP)/src/mesa/swrast_setup
+ -I$(TOP)/src/mesa/main
projects / mesa.git / blobdiff