Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mesa: added "main/" prefix to includes, remove some -I paths from ↵ | Brian Paul | 2008-09-18 | 1 | -3/+0 |
| | | | | Makefile.template | ||||
* | Revert "Revert "Merge branch 'drm-gem'"" | Dave Airlie | 2008-08-24 | 1 | -5/+0 |
| | | | | This reverts commit 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a. | ||||
* | Revert "Merge branch 'drm-gem'" | Dave Airlie | 2008-08-24 | 1 | -0/+5 |
| | | | | | | | | This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03. Conflicts: src/mesa/drivers/dri/i965/brw_wm_surface_state.c | ||||
* | Merge branch 'master' into drm-gem | Ian Romanick | 2008-07-25 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/i965/brw_wm_surface_state.c | ||||
| * | Always pass -linker and -ldflags to mklib for shared libraries | Dan Nicholson | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | This just makes the use of mklib more consistent throughout Mesa where we always want to pass the linker and LDFLAGS when we might be making a shared library. | ||||
| * | Call mklib with $(SHELL) so the user controls the interpreter | Dan Nicholson | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | | | Respect the user's choice of shell when running mklib rather than always using /bin/sh. | ||||
* | | Merge commit 'origin/master' into drm-gem | Eric Anholt | 2008-06-18 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | fix Xlib libGL.so build problem. | Brian Paul | 2008-06-09 | 1 | -1/+0 |
| | | | | | | | | Also, build driverfuncs.c into libmesa.a since it's always needed. | ||||
* | | [intel] Convert drivers to using libdrm bufmgr code. | Eric Anholt | 2008-06-03 | 1 | -4/+0 |
| | | |||||
* | | GEM: Make dri_emit_reloc take GEM domain flags instead of TTM flags. | Eric Anholt | 2008-05-07 | 1 | -2/+1 |
|/ | | | | | | The GEM flags are much more descriptive for what we need. Since this makes bufmgr_fake rather device-specific, move it to the intel common directory. We've wanted to do device-specific stuff to it before. | ||||
* | autoconf: Add gcc search patch to MKDEP_OPTIONS to eliminate warnings. | Kristian Høgsberg | 2008-02-25 | 1 | -2/+2 |
| | | | | | Also, use -include to avoid error message when make initially fails to include the non-existent depend file. | ||||
* | Fix parallel build by making symlinks before makedepend. | Adam Jackson | 2008-02-15 | 1 | -1/+1 |
| | |||||
* | i915: fixup up bufmgr to pass num buffers to kernel | Dave Airlie | 2007-10-09 | 1 | -1/+0 |
| | | | | remove unneeded entry points | ||||
* | add support for LDFLAGS env var | Dan Nicholson | 2007-09-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into i915-unification | Eric Anholt | 2007-09-20 | 1 | -7/+2 |
|\ | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/i915_vtbl.c src/mesa/drivers/dri/i915tex/intel_batchbuffer.c src/mesa/drivers/dri/i915tex/intel_context.c | ||||
| * | DESTDIR support. | Dan Nicholson | 2007-09-12 | 1 | -2/+2 |
| | | |||||
| * | Fix-up #includes to remove some -I options. | Brian | 2007-09-11 | 1 | -5/+0 |
| | | | | | | | | eg: #include "shader/program.h" and remove -I$(TOP)/src/mesa/program | ||||
* | | Merge branch 'master' into i915-unification | Eric Anholt | 2007-05-18 | 1 | -10/+7 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/intel_batchpool.c src/mesa/drivers/dri/i915tex/intel_buffer_objects.c src/mesa/drivers/dri/i915tex/intel_regions.c src/mesa/drivers/dri/i915tex/intel_screen.c src/mesa/drivers/dri/i915tex/intel_screen.h | ||||
| * | Replace `pkg-config --cflags libdrm` with LIBDRM_CFLAGS, remove disabled ↵ | Brian | 2007-05-10 | 1 | -9/+5 |
| | | | | | | | | lines, remove obsolete comments. | ||||
| * | Makefile clean-ups for miniglx. | Brian | 2007-05-04 | 1 | -1/+2 |
| | | |||||
* | | WIP: Replace TTM buffer pool manager with a simplified interface. | Eric Anholt | 2007-05-16 | 1 | -1/+2 |
|/ | | | | | | | | The interface is not solid yet (some simplification to do still, and adjustment for 0-copy), and the drivers are not converted. However, the new interface allows using the same calls to support either a TTM or a classic static allocation backend, with the static backend allowing a more limited feature set. | ||||
* | Merge texmem-0-3-branch. | Keith Whitwell | 2006-11-01 | 1 | -1/+6 |
| | |||||
* | change make depend output redirection to 2>&1 (bug 8344) | Brian Paul | 2006-09-18 | 1 | -1/+1 |
| | |||||
* | LIB_DIR is now just 'lib' or 'lib64' | Brian Paul | 2006-07-13 | 1 | -5/+5 |
| | | | | | Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck. | ||||
* | Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/. | Brian Paul | 2006-06-26 | 1 | -1/+1 |
| | | | | Probably need to fix the install destinations too... | ||||
* | New 'install' targets in makefile. See bug 2372. | Brian Paul | 2006-06-22 | 1 | -2/+3 |
| | |||||
* | remove some unneeded includes | Dave Airlie | 2006-05-02 | 1 | -3/+1 |
| | |||||
* | move the pkg config flags for libdrm to the bottom | Dave Airlie | 2006-05-02 | 1 | -2/+2 |
| | |||||
* | depend is not a .PHONY target | Brian Paul | 2006-04-21 | 1 | -1/+0 |
| | |||||
* | replace >&/dev/null with >/dev/null so it works with all shells | Brian Paul | 2006-04-07 | 1 | -1/+1 |
| | |||||
* | make miniglx use libdrm properly | Dave Airlie | 2006-04-07 | 1 | -3/+2 |
| | |||||
* | Replace DEFINES with DRIVER_DEFINES. If a driver needs to set extra flags, | Brian Paul | 2006-04-06 | 1 | -4/+4 |
| | | | | | do so with DRIVER_DEFINES. This eliminates the duplicated flags we were passing to each cc command. | ||||
* | merge from texman branch | Brian Paul | 2006-03-26 | 1 | -1/+1 |
| | |||||
* | Add _mesa_exec_malloc() and _mesa_exec_free() for allocating | Keith Whitwell | 2005-10-18 | 1 | -1/+0 |
| | | | | | executable memory. Based on Thomas Hellstrom's patch. TODO: glapi.c also needs this, but cannot access this code. | ||||
* | use mklib script to make drivers instead of gcc -shared | Brian Paul | 2005-09-14 | 1 | -3/+2 |
| | |||||
* | Use mklib script instead of ar. Make libmesa.a instead of mesa.a | Brian Paul | 2005-09-06 | 1 | -1/+1 |
| | |||||
* | Convert libGL and DRI drivers to require libdrm. | Adam Jackson | 2005-08-19 | 1 | -3/+2 |
| | | | | | | libdrm can be had from: http://people.freedesktop.org/~ajax/libdrm/ | ||||
* | More EGL prep. No impact on anything outside of EGL | Jon Smirl | 2005-08-05 | 1 | -1/+2 |
| | |||||
* | Use the routines supplied in the __DRIinterfaceMethods structure to create a | Ian Romanick | 2005-07-28 | 1 | -2/+1 |
| | | | | | destroy __GLcontextModes structures. This eliminates the need for DRI drivers to ever link with glcontextmodes.c. | ||||
* | replace gcc with $(CC) (Egbert Eich) | Brian Paul | 2005-07-15 | 1 | -4/+2 |
| | |||||
* | Add a freebsd-dri-amd64 config, and quiet makedepend slightly by making an | Eric Anholt | 2005-05-28 | 1 | -1/+1 |
| | | | | | EXPAT_INCLUDES config variable (set on FreeBSD) which is then used in Makefile.template's INCLUDES. | ||||
* | First attempt at getting egl support up on dumb framebuffer. | Jon Smirl | 2005-05-13 | 1 | -1/+2 |
| | | | | Seems to be mostly working. Not all of egl API is implemented. | ||||
* | Refactor COMMON_SOURCES up to Makefile.template | Adam Jackson | 2005-05-05 | 1 | -0/+10 |
| | |||||
* | Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is | Ian Romanick | 2005-04-06 | 1 | -1/+1 |
| | | | | | | where things like "-m64" or "-m32" should be specified. Using this, a 32-bit DRI build can be done on an x86-64 system by doing 'ARCH_CFLAGS=-m32 make linux-dri-x86'. Minor tweaks to linux-dri to support these changes. | ||||
* | Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless. | Adam Jackson | 2005-01-31 | 1 | -5/+0 |
| | |||||
* | Remove -C flags for install which aren't universally supported. | Keith Whitwell | 2005-01-07 | 1 | -2/+2 |
| | |||||
* | Improve the semantics of the 'install' target to make sure the right | Keith Whitwell | 2005-01-07 | 1 | -3/+10 |
| | | | | | | file is really being installed. Useful if you have multiple versions of a single driver directory hanging around and want to switch between them for testing. | ||||
* | Use DRM headers from $(DRM_SOURCE_PATH)/shared-core instead of .../shared. | Felix Kuehling | 2005-01-01 | 1 | -4/+3 |
| | |||||
* | Get linux-solo dependencies building correctly, | Keith Whitwell | 2004-12-09 | 1 | -1/+1 |
| | | | | Make sure symlinks are built in driver directories before running makedepend. | ||||
* | Improve the behaviour of the build system wrt depend files. | Keith Whitwell | 2004-12-08 | 1 | -2/+2 |
| | | | | | | | | - Remove the -Y option for makedepend, so that the standard directories are searched - No longer pipe the multiple errors that the -Y option caused into /dev/null -- we want to know about these failures. - Fix up a few other misc makedepend failures. |