summaryrefslogtreecommitdiffstats
path: root/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-101-3/+3
|\ | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * configs: darwin: Don't build GLwJeremy Huddleston2008-09-261-3/+3
| | | | | | | | (cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013)
* | cell: implement more built-in shader functions, link spu code with -lmBrian Paul2008-10-081-1/+1
| |
* | Gallivm: port to llvm 2.4.Stephane Marchesin2008-10-021-0/+1
| |
* | Gallivm: need to link with libstdc++ for llvm.Stephane Marchesin2008-10-021-1/+1
| |
* | Add -msse and -msse2 to the *-x86 configs.José Fonseca2008-10-012-2/+3
| |
* | mesa: build gallium directories before core mesaKeith Whitwell2008-09-121-1/+1
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-113-3/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
| * | define new APP_CC configuration variable for building apps/demos/testsBrian Paul2008-09-112-1/+7
| | | | | | | | | | | | | | | For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
| * | cell: add -DDEBUG flag, fixes to Cell MakefilesBrian Paul2008-09-031-1/+1
| | |
| * | Cell: added linux-cell-debug configBrian Paul2008-09-032-2/+14
| | | | | | | | | | | | | | | linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile.
| * | cell: use SDK 3.0 by defaultBrian Paul2008-08-261-1/+5
| | |
* | | add gallium dirAlan Hourihane2008-09-111-2/+2
| | | | | | | | | | | | winsys/common -> winsys/
* | | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-111-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
| * | change MESA_MINOR to 3Brian Paul2008-08-261-1/+1
| | |
* | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1136-105/+314
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * consolidate intel directories.Alan Hourihane2008-08-172-3/+1
| | | | | | | | | | | | we now have src/gallium/winsys/drm/intel/{common,dri,egl}
| * choose sane default for dri driver locationAlan Hourihane2008-08-171-1/+1
| |
| * EGL: Only build EGL dri based drivers under linux-dri based configsJakob Bornecrantz2008-07-132-0/+4
| |
| * build egl subdirsBrian Paul2008-07-111-11/+1
| |
| * gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies on utilJakob Bornecrantz2008-07-101-1/+1
| |
| * gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a interdependenciesBrian Paul2008-07-101-1/+1
| | | | | | | | libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
| * mesa: Do not compile the dri drivers in mesaJakob Bornecrantz2008-06-081-1/+1
| |
| * gallium: Only build intel_drm for linux-dri targetsJakob Bornecrantz2008-06-062-1/+2
| |
| * i915: Moved pipe_buffer and i915_winsys functions to a common folderJakob Bornecrantz2008-06-061-0/+1
| |
| * build egl_xlib/ too (softpipe_egl.so library)Brian Paul2008-06-051-1/+1
| |
| * egl: build libEGL and softpipe_egl.so by defaultBrian Paul2008-06-051-2/+2
| |
| * Build with -O2Alan Hourihane2008-06-041-1/+1
| |
| * Merge branch 'gallium-i915-current' into gallium-0.1Jakob Bornecrantz2008-05-232-1/+68
| |\
| | * egl: Don't build EGL programs eitherJakob Bornecrantz2008-05-231-1/+0
| | |
| | * egl: Stoped compiling EGL completelyJakob Bornecrantz2008-05-231-1/+2
| | |
| | * mesa: Added linux-egl target, that only builds the i915simple driver and egl ↵Jakob Bornecrantz2008-05-231-0/+65
| | | | | | | | | | | | drivers
| | * mesa: On second thought lets not build the driverJakob Bornecrantz2008-05-231-6/+6
| | |
| | * disable egl by defaultZack Rusin2008-05-221-1/+1
| | |
| | * mesa: Made linux-dri targets build EGLJakob Bornecrantz2008-05-141-3/+5
| | |
| * | gallium: reorder libs so that translate can see rtasmKeith Whitwell2008-04-181-1/+1
| | |
| * | gallium: add translate directoryKeith Whitwell2008-04-151-1/+1
| |/
| * cell: Enable MIT-SHM on Cell.Ian Romanick2008-03-251-1/+3
| |
| * gallium: new surface/context tracker (sct) moduleBrian2008-03-101-1/+1
| | | | | | | | | | Will be used for tracking the surfaces and textures which are bound/used by contexts.
| * Remove files of unsupported build systems.José Fonseca2008-02-251-42/+0
| |
| * Cell: Add missing "gallium/winsys" to SRC_DIRS to fix build.Ian Romanick2008-02-191-1/+1
| |
| * Simplify makefile boilerplate code.José Fonseca2008-02-1921-35/+35
| | | | | | | | | | Don't define ASM_SOURCES variable globally -- reserve that variable to be defined locally by makefiles, together with C_SOURCES and CPP_SOURCES.
| * Bring rtasm from mesa to gallium.José Fonseca2008-02-191-1/+1
| |
| * Update for llvm -> gallivm rename.José Fonseca2008-02-181-1/+1
| |
| * Build glx/x11.José Fonseca2008-02-181-0/+1
| |
| * Code reorganization: split gallium and mesa makefiles.José Fonseca2008-02-184-6/+17
| | | | | | | | | | | | | | In other words, don't build src/gallium source code from within src/mesa/Makefile. Also, allow to customize which gallium auxiliary dirs, driver driver, winsys dirs get built from the config/* files.
| * Cell: Add missing back-slash in linux-cell config fileIan Romanick2008-02-151-1/+1
| |
| * Cell: Add INCLUDE_DIRS to SPU_CFLAGS to fix build.Ian Romanick2008-02-151-1/+3
| |
| * Code reorganization: update build.José Fonseca2008-02-1515-18/+18
| | | | | | | | | | | | | | | | | | Update the Makefiles and includes for the new paths. Note that there hasn't been no separation of the Makefiles yet, and make is jumping all over the place. That will be taken care shortly. But for now, make should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm might require some minor tweaks.
| * Cell: add OPT_FLAGS varBrian2008-01-281-2/+4
| |