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/matrix.c \
main/mipmap.c \
main/mm.c \
+ main/multisample.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 \
main/texcompress.c \
main/texcompress_s3tc.c \
main/texcompress_fxt1.c \
+ main/texenv.c \
main/texenvprogram.c \
main/texformat.c \
+ main/texgen.c \
main/teximage.c \
main/texobj.c \
+ main/texparam.c \
main/texrender.c \
main/texstate.c \
main/texstore.c \
GLAPI_SOURCES = \
main/dispatch.c \
glapi/glapi.c \
+ glapi/glapi_getproc.c \
glapi/glthread.c
MATH_SOURCES = \
math/m_vector.c \
math/m_xform.c
-__SWRAST_SOURCES = \
+SWRAST_SOURCES = \
swrast/s_aaline.c \
swrast/s_aatriangle.c \
swrast/s_accum.c \
swrast/s_triangle.c \
swrast/s_zoom.c
-__SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_SOURCES = \
swrast_setup/ss_context.c \
swrast_setup/ss_triangle.c
-__TNL_SOURCES = \
+TNL_SOURCES = \
tnl/t_context.c \
tnl/t_pipeline.c \
tnl/t_draw.c \
vbo/vbo_save_draw.c \
vbo/vbo_save_loopback.c
-VF_SOURCES = \
- vf/vf.c \
- vf/vf_generic.c \
- vf/vf_sse.c
-
-STATETRACKER_SOURCES = \
- state_tracker/st_atom.c \
- state_tracker/st_atom_blend.c \
- state_tracker/st_atom_clip.c \
- state_tracker/st_atom_constbuf.c \
- state_tracker/st_atom_depth.c \
- state_tracker/st_atom_framebuffer.c \
- state_tracker/st_atom_pixeltransfer.c \
- state_tracker/st_atom_sampler.c \
- state_tracker/st_atom_scissor.c \
- state_tracker/st_atom_shader.c \
- state_tracker/st_atom_rasterizer.c \
- state_tracker/st_atom_stipple.c \
- state_tracker/st_atom_texture.c \
- state_tracker/st_atom_viewport.c \
- state_tracker/st_cb_accum.c \
- state_tracker/st_cb_bitmap.c \
- state_tracker/st_cb_blit.c \
- state_tracker/st_cb_bufferobjects.c \
- state_tracker/st_cb_clear.c \
- state_tracker/st_cb_flush.c \
- state_tracker/st_cb_drawpixels.c \
- state_tracker/st_cb_fbo.c \
- state_tracker/st_cb_feedback.c \
- state_tracker/st_cb_program.c \
- state_tracker/st_cb_queryobj.c \
- state_tracker/st_cb_rasterpos.c \
- state_tracker/st_cb_readpixels.c \
- state_tracker/st_cb_strings.c \
- state_tracker/st_cb_texture.c \
- state_tracker/st_context.c \
- state_tracker/st_debug.c \
- state_tracker/st_draw.c \
- state_tracker/st_extensions.c \
- state_tracker/st_format.c \
- state_tracker/st_framebuffer.c \
- state_tracker/st_gen_mipmap.c \
- state_tracker/st_mesa_to_tgsi.c \
- state_tracker/st_program.c \
- state_tracker/st_texture.c
SHADER_SOURCES = \
shader/arbprogparse.c \
x86/x86.c \
x86/3dnow.c \
x86/sse.c \
+ x86/rtasm/x86sse.c \
sparc/sparc.c \
ppc/common_ppc.c \
x86-64/x86-64.c
SPARC_API = \
sparc/glapi_sparc.S
-__COMMON_DRIVER_SOURCES = \
+COMMON_DRIVER_SOURCES = \
drivers/common/driverfuncs.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) \
- $(MESA_ASM_SOURCES) \
- $(COMMON_DRIVER_SOURCES)\
- $(X11_DRIVER_SOURCES) \
- $(FBDEV_DRIVER_SOURCES) \
- $(OSMESA_DRIVER_SOURCES)
-
-SOLO_SOURCES = \
+MESA_SOURCES = \
$(MAIN_SOURCES) \
$(MATH_SOURCES) \
$(VBO_SOURCES) \
- $(VF_SOURCES) \
- $(DRAW_SOURCES) \
- $(TGSIEXEC_SOURCES) \
- $(TGSIUTIL_SOURCES) \
- $(PIPEUTIL_SOURCES) \
- $(STATECACHE_SOURCES) \
- $(STATETRACKER_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)
+ $(MESA_ASM_SOURCES) \
+ $(COMMON_DRIVER_SOURCES)
### Object files
-SOLO_OBJECTS = \
- $(SOLO_SOURCES:.c=.o) \
+MESA_OBJECTS = \
+ $(MESA_SOURCES:.c=.o) \
$(MESA_ASM_SOURCES:.S=.o)
GLAPI_OBJECTS = \
$(GLAPI_SOURCES:.c=.o) \
$(GLAPI_ASM_SOURCES:.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/gallium/include \
- -I$(TOP)/src/gallium/drivers \
- -I$(TOP)/src/gallium/auxiliary
-
-OLD_INCLUDE_DIRS = \
- -I$(TOP)/src/mesa/tnl \
- -I$(TOP)/src/mesa/math \
- -I$(TOP)/src/mesa/swrast \
- -I$(TOP)/src/mesa/swrast_setup \
- -I$(TOP)/src/mesa/shader \
- -I$(TOP)/src/mesa/shader/grammar \
- -I$(TOP)/src/mesa/shader/slang \
- -I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi
+ -I$(TOP)/src/mesa
projects / mesa.git / blobdiff