Commit Graph

499 Commits

Author SHA1 Message Date
Brian Paul 2b9b42befa cell: added -D_BSD_SOURCE flag
Needed to get MAP_ANONYMOUS in execmem.c and to define timezone type in glxgears.c
Adding -std=c99 earlier caused this regression.
2008-10-27 18:16:34 -06:00
Ben Skeggs 70a06e03d4 Merge remote branch 'origin/gallium-0.2' into gallium-0.2 2008-10-27 15:40:33 +11:00
Brian Paul 82477e485d cell: add -std=c99 flag to solve some warning/prototype issues 2008-10-22 11:13:55 -06:00
Alan Hourihane b50a0b89d9 build "GLX" egl driver by default and egl demos 2008-10-16 23:42:12 +01:00
Ben Skeggs 295d6f8e8f Merge remote branch 'origin/gallium-0.2' into gallium-0.2 2008-10-15 13:21:11 +11:00
Keith Whitwell 3a3801c143 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/glapi/descrip.mms
	src/mesa/shader/grammar/descrip.mms
2008-10-10 15:26:28 +01:00
Brian Paul a4e477433f cell: implement more built-in shader functions, link spu code with -lm 2008-10-08 20:34:35 -06:00
Stephane Marchesin 3f4b67f5d7 Gallivm: port to llvm 2.4. 2008-10-02 10:19:47 -04:00
Stephane Marchesin 9859edc606 Gallivm: need to link with libstdc++ for llvm. 2008-10-02 10:19:47 -04:00
José Fonseca 23e325e55a Add -msse and -msse2 to the *-x86 configs. 2008-10-01 10:25:41 +09:00
Jeremy Huddleston 8338cc25f9 configs: darwin: Don't build GLw
(cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013)
2008-09-26 12:37:31 -07:00
Ben Skeggs 63c49bee3a Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2 2008-09-12 22:53:44 +10:00
Keith Whitwell f7d7a212cd mesa: build gallium directories before core mesa 2008-09-12 12:24:21 +01:00
Ben Skeggs cbe05a4734 Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
Conflicts:
	configs/linux-dri
2008-09-12 20:37:33 +10:00
Ben Skeggs 81335d0f17 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-09-12 20:33:59 +10:00
Keith Whitwell cc7dd4fc1b Merge commit 'origin/gallium-0.1' into gallium-0.2
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
2008-09-11 18:32:05 +01:00
Alan Hourihane cdd97ceca0 add gallium dir
winsys/common -> winsys/
2008-09-11 18:06:05 +01:00
Brian Paul 90c93bbeee define new APP_CC configuration variable for building apps/demos/tests
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"
2008-09-11 11:00:54 -06:00
Alan Hourihane 47ad296a18 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into 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
2008-09-11 17:32:18 +01:00
Keith Whitwell 0397b2bb41 Merge branch 'gallium-0.1' into gallium-0.2
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
2008-09-11 16:05:15 +01:00
Ben Skeggs 7158203b08 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
	configs/default
2008-09-11 06:09:05 +10:00
Brian Paul fafc36920e cell: add -DDEBUG flag, fixes to Cell Makefiles 2008-09-03 09:31:36 -06:00
Brian Paul ab93aa774e Cell: added linux-cell-debug config
linux-cell is now the optimized configuration.
Remove some Cell-specific stuff from winsys/xlib/Makefile.
2008-09-03 09:08:46 -06:00
Brian Paul 019b9529e5 change MESA_MINOR to 3 2008-08-26 15:59:06 -06:00
Brian Paul b5ab3b7dfc cell: use SDK 3.0 by default 2008-08-26 14:10:29 -06:00
Alan Hourihane ccf1910dd4 consolidate intel directories.
we now have

src/gallium/winsys/drm/intel/{common,dri,egl}
2008-08-17 20:17:18 +01:00
Alan Hourihane 3eeafb7179 choose sane default for dri driver location 2008-08-17 19:12:54 +01:00
Jeremy Huddleston f911ca0834 Removed broken/unsupported darwin-static configs
Fixed typo in darwin config
2008-08-12 11:04:19 -07:00
Jeremy Huddleston 98e7c1cf38 Fixed 'make install' for darwin 2008-08-12 10:59:40 -07:00
Jeremy Huddleston c61f4e2cce Apple: More cleanup of the darwin config in 7.1 2008-08-12 09:45:04 -07:00
Jeremy Huddleston 01ac4540f0 Apple: Some changes to fix compilation problems on OSX 2008-08-08 02:19:52 -07:00
Ben Skeggs 704dca40c4 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-07-23 14:05:22 +10:00
Brian Paul 77497eb73b mesa: revert building glslcompiler by default 2008-07-21 09:01:34 -06:00
Dan Nicholson 776c60d3c3 autoconf: Support Motif widgets in GLw with --enable-motif
Add an --enable-motif option, which will enable the Motif widgets in
libGLw and link it with libXm. The Motif installation information will
be gathered from the motif-config script (this comes with LessTif) or
fallback to the standard autoconf checks.

To allow the location of the Motif headers to be set from configure, the
default setting of -I/usr/include/Motif1.2 has been moved into
configs/default and then passed to the Makefile through the MOTIF_CFLAGS
variable.
2008-07-18 08:07:07 -07:00
Brian Paul 3bfedb7ed4 mesa: build the stand-alone glslcompiler by default, update the docs 2008-07-17 15:40:10 -06:00
Stephane Marchesin 93115c4b23 nouveau: say goodbye to the old DRI driver... 2008-07-14 01:03:07 +02:00
Jakob Bornecrantz e59086ab91 EGL: Only build EGL dri based drivers under linux-dri based configs 2008-07-13 18:05:20 +02:00
Ben Skeggs d68a3ebf0e Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-07-14 01:14:52 +10:00
Dan Nicholson db072baaaf Call mklib with $(SHELL) so the user controls the interpreter
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
2008-07-12 10:25:40 -07:00
Dan Nicholson 4f5d97ee9e Call minstall with $(SHELL) so the user controls the interpreter
Running minstall directly means that /bin/sh is always used as hte
interpreter. If the user needs or wants to use a different shell fo
minstall, they can use the SHELL make variable.
2008-07-12 10:25:40 -07:00
Dan Nicholson 9eee7f260f Set $(SHELL) for all configs
Most make implementations will use /bin/sh as the interpreter for
commands and only use a different shell when the $(SHELL) make variable
is set. This makes the setting explicit and allows $(SHELL) to be used
in the commands themselves.
2008-07-12 10:25:40 -07:00
Dan Nicholson bfb27b5fc0 autoconf: Subsitute SHELL for all platforms
Establish the shell that make will use from configure. This is exactly
how autoconf/automake operate, with the environment variable
CONFIG_SHELL respected to override the autoconf checks. In the usual
case where the user just executes `./configure', autoconf will pick a
shell from the current shell, sh, bash, ksh or sh5 that meets its base
criteria.

The special Solaris case of looking for a POSIX shell has been changed
to just set the SHELL variable since autoconf substitutes this already.
The EXTRA_CONFIG_LINES substitution is dropped as it should no longer be
needed.
2008-07-12 10:25:40 -07:00
Brian Paul 7986baf7cf build egl subdirs 2008-07-11 15:45:03 -06:00
Jakob Bornecrantz 5de823c00b gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies on util 2008-07-10 22:41:34 +02:00
Brian Paul a452e0cbde gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a interdependencies
libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
2008-07-10 13:28:22 -06:00
Stephane Marchesin 52a68dd9eb nv04. 2008-07-08 01:06:18 +02:00
Dan Nicholson 11ac5b2456 Set library and header installation directories from configuration
Currently the installation directories for libraries and headers are
resolved within the install commands. For instance, the libraries will
be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility
of the installation, such as when the libraries should be installed to a
subdirectory like /usr/lib/tls.

This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR)
to define the locations that the libraries and headers are installed.
For the static configs, this resolves exactly as before to
$(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they
are derived directly from the --libdir and --includedir settings.
2008-07-06 14:15:40 -07:00
Ben Skeggs aa3ab377e6 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:

	configs/default
2008-06-23 00:01:17 +10:00
Alan Coopersmith e1f9adc274 Solaris port of Mesa 7.1 with autoconf support
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-21 10:19:45 -06:00
Jakob Bornecrantz 80ab4c3f8c mesa: Do not compile the dri drivers in mesa 2008-06-08 17:29:56 +02:00
Jakob Bornecrantz 3d514a9070 gallium: Only build intel_drm for linux-dri targets 2008-06-06 16:50:52 +02:00
Jakob Bornecrantz adbdabb85a i915: Moved pipe_buffer and i915_winsys functions to a common folder 2008-06-06 14:49:02 +02:00
Brian Paul b11aad2abe build egl_xlib/ too (softpipe_egl.so library) 2008-06-05 14:41:28 -06:00
Brian Paul e7725e136f egl: build libEGL and softpipe_egl.so by default 2008-06-05 14:12:27 -06:00
Alan Hourihane c218b8c6c6 Build with -O2 2008-06-04 09:56:00 +01:00
Ben Skeggs 9212085194 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-05-25 14:19:18 +10:00
George Sapountzis d4510e53d8 drop GLcore 2008-05-23 22:48:55 +03:00
Jakob Bornecrantz a3dbd412df Merge branch 'gallium-i915-current' into gallium-0.1 2008-05-23 16:26:14 +02:00
Jakob Bornecrantz a22462f6ef egl: Don't build EGL programs either 2008-05-23 16:25:51 +02:00
Jakob Bornecrantz 2064826bda egl: Stoped compiling EGL completely 2008-05-23 16:18:42 +02:00
Jakob Bornecrantz 9395fb6e8d mesa: Added linux-egl target, that only builds the i915simple driver and egl drivers 2008-05-23 11:02:14 +02:00
Jakob Bornecrantz 3972961e62 mesa: On second thought lets not build the driver 2008-05-23 11:02:14 +02:00
Zack Rusin 6f25d6d48d disable egl by default 2008-05-22 22:13:38 -04:00
Jakob Bornecrantz 6c78b8e97b mesa: Made linux-dri targets build EGL 2008-05-14 17:20:56 +02:00
Dan Nicholson 5dbbde5b22 Default DRI driver directory to match X.Org xserver
Since the only valid consumer of the DRI drivers is the X.Org xserver,
this changes the default DRI driver directory to match xorg-server:
${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for
nearly all current systems.
2008-05-09 07:06:52 -07:00
Dan Nicholson 00994ac08c autoconf: Scrape the version from configs/default
Added the make script version.mk to print the various version numbers
from configs/default. This is used to substitute the version in autoconf
rather than duplicating it in both places.
2008-05-05 14:21:28 -07:00
George Sapountzis 2ed0f7278e glcore: Set all external variables in configuration
based on patch by Dan Nicholson <dbn.lists@gmail.com>
2008-05-05 18:14:52 +03:00
Dan Nicholson 80f68e1b6a autoconf: Don't substitute MESA_MAJOR and friends
Since the autoconf config inherits from default, we don't need to
duplicate and substitute the MESA_* version numbers in configure.ac.
The version number is only needed in configure for the help text.
2008-04-30 13:31:44 -07:00
George Sapountzis 750f52169c glcore: tree sharing for DRI and XMesa 2008-04-23 11:12:30 +03:00
George Sapountzis 32a2a095f4 glcore: build from mesa 2008-04-23 11:12:30 +03:00
Ben Skeggs 104ff59585 Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1 2008-04-23 12:39:38 +10:00
Keith Whitwell 59ba8ea00b gallium: reorder libs so that translate can see rtasm 2008-04-18 18:32:37 +01:00
Keith Whitwell 08861688d3 gallium: add translate directory 2008-04-15 15:07:50 +01:00
Kristian Høgsberg e82dd8c6e1 DRI interface changes and DRI2 direct rendering support.
Add DRI2 direct rendering support to libGL and add DRI2 client side
protocol code.  Extend the GLX 1.3 create drawable functions in
glx_pbuffer.c to call into the DRI driver when possible.

Introduce __DRIconfig, opaque struct that represents a DRI driver
configuration.  Get's rid of the open coded __GLcontextModes in the
DRI driver interface and the context modes create and destroy
functions that the loader was requires to provide.  glcore.h is no
longer part of the DRI driver interface.  The DRI config is GL binding
agnostic, that is, not specific to GLX, EGL or other bindings.

The core API is now also an extension, and the driver exports a list
of extensions as the symbol __driDriverExtensions, which the loader
must dlsym() for.  The list of extension will always include the DRI
core extension, which allows creating and manipulating DRI screens,
drawables and contexts.  The DRI legacy extension, when available,
provides alternative entry points for creating the DRI objects that
work with the XF86DRI infrastructure.

Change DRI2 client code to not use drm drawables or contexts.  We
never used drm_drawable_t's and the only use for drm_context_t was as
a unique identifier when taking the lock.  We now just allocate a
unique lock ID out of the DRILock sarea block.  Once we get rid of the
lock entirely, we can drop this hack.

Change the interface between dri_util.c and the drivers, so that the
drivers now export the DriverAPI struct as driDriverAPI instead of the
InitScreen entry point.  This lets us avoid dlsym()'ing for the DRI2
init screen function to see if DRI2 is supported by the driver.
2008-03-31 16:51:26 -04:00
Ben Skeggs 03c60e0fb6 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-03-30 19:58:03 +10:00
Ian Romanick 542e3464a4 cell: Enable MIT-SHM on Cell. 2008-03-25 18:15:58 -07:00
Stephane Marchesin d493203045 nv10. 2008-03-15 05:37:57 +01:00
Ben Skeggs 03ec663758 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-03-13 13:39:05 +11:00
Brian d5692cb349 gallium: new surface/context tracker (sct) module
Will be used for tracking the surfaces and textures which are bound/used by
contexts.
2008-03-10 17:22:18 -06:00
Jeremy Huddleston 4dfd2dcbe7 Darwin: Fixed small error in darwin config files
(cherry picked from commit a21c61ee8bc86a8843024cbf8e9daf4b39a7571a)
2008-03-10 16:03:29 -07:00
Jeremy Huddleston 7c7fece977 Darwin: Config/source fixes to now build glxdemo apps and OSMesa
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config
(cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
2008-03-10 15:21:39 -07:00
José Fonseca 60159c1b09 Convert crlf->lf line endings.
Windows/DOS users should enable core.autocrlf from now on:

  git config --global core.autocrlf true
2008-02-28 16:34:32 +09:00
Ben Skeggs 68ef528862 Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1 2008-02-27 00:34:31 +11:00
Kristian Høgsberg bcecea6ea6 autoconf: Add gcc search patch to MKDEP_OPTIONS to eliminate warnings.
Also, use -include to avoid error message when make initially fails to
include the non-existent depend file.
2008-02-25 19:02:07 -05:00
José Fonseca 2d38d1b300 Remove files of unsupported build systems. 2008-02-25 17:11:28 +09:00
Ben Skeggs 73e0e567de nouveau: fix build 2008-02-22 12:36:48 +11:00
Ian Romanick d119931002 Cell: Add missing "gallium/winsys" to SRC_DIRS to fix build. 2008-02-19 09:43:47 -08:00
Jeremy Huddleston 9993ccce69 Apple: Pulled in changes from Apple's patchset to allow mesa to build on darwin again
(cherry picked from commit e70609b7b877dc0d8e67c958c453305e78f831df)
2008-02-19 00:55:11 -08:00
José Fonseca 90b2beb661 Simplify makefile boilerplate code.
Don't define ASM_SOURCES variable globally -- reserve that variable to be defined
locally by makefiles, together with C_SOURCES and CPP_SOURCES.
2008-02-19 14:06:11 +09:00
José Fonseca df8ab3140c Bring rtasm from mesa to gallium. 2008-02-19 14:01:49 +09:00
José Fonseca 0448dbd64a Update for llvm -> gallivm rename. 2008-02-18 12:33:34 +00:00
José Fonseca 1f2d011786 Build glx/x11. 2008-02-18 15:45:29 +09:00
José Fonseca bfd5916eaf Code reorganization: split gallium and mesa makefiles.
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.
2008-02-18 14:25:04 +09:00
Ian Romanick 71071b7a9e Cell: Add missing back-slash in linux-cell config file 2008-02-15 10:36:48 -08:00
Ian Romanick eb3f7aa6f8 Cell: Add INCLUDE_DIRS to SPU_CFLAGS to fix build. 2008-02-15 10:33:12 -08:00
José Fonseca 6acd63a498 Code reorganization: update build.
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.
2008-02-15 17:50:12 +09:00
Dan Nicholson 817af9bec2 glapi: Use variable for indent and flags
Put the path to indent and the flags to call it with in configs/default
rather than in the Makefile. This makes it easier to change the values
globally.
2008-02-12 06:43:23 -08:00
Brian 59e7bfd5ac Cell: add OPT_FLAGS var 2008-01-28 18:18:46 -07:00
Brian 7d0421d6cd Cell: s/-W/-Wall/ in linux-cell 2008-01-24 17:04:54 -07:00
Ian Romanick b3492a2052 Use HOST_CC for programs that will run on the build host 2008-01-23 15:25:52 -08:00
Ian Romanick ffcb4d8498 Use EXTRA_LIB_PATH with *_LIB_DEPS
Make sure EXTRA_LIB_PATH is used with all the LIB_DEPS.  Re-order some
of the options and tweak the whitespace to make the various LIB_DEPS
more readable.  This makes building for Cell on x86 a bit easier and
doesn't seem to effect other builds.
2008-01-23 15:25:52 -08:00
Ian Romanick eb4a7382dc Remove unnecessary paths
Removing the paths on certain commands (e.g., ppu32-gcc) and removing
-I/usr/include makes it possible to build for Cell on both PowerPC and
x86 hosts.
2008-01-23 15:25:52 -08:00
Zack Rusin 9789c301b4 llvm: we need custom rules so had to redo the build a little bit
also don't use sse when llvm is enabled
2008-01-04 09:27:42 -05:00
Brian 1613c49c98 Cell: added -Wmissing-prototypes to SPU_CFLAGS 2008-01-03 09:57:12 -07:00
Dan Nicholson 2b440d5461 Merge branch 'master' into autoconf2 2007-12-26 15:41:24 -06:00
Dan Nicholson da693b7c89 Don't try to build nonexistent i915tex driver on linux-x86-64 2007-12-18 22:20:37 -08:00
Ian Romanick 9a0fe23d49 Port to libspe2
libspe is deprecated in Cell SDK 2.1, and it is removed in Cell SDK 3.0.
This patch ports the existing libspe-based code to libspe2.  Some error
checking (eh-hem) would be nice.
2007-12-11 12:43:50 -08:00
Ian Romanick bfb43e8e79 Remove '-include altivec.h'.
Including altivec.h caused problems in some places that use "pixel" as a
variable name.
2007-12-11 12:41:12 -08:00
Zack Rusin 63a9d835ce Redo the fragment program examples to match vp's
we just load text files instead of compiling tons of small
binaries
2007-12-11 09:49:34 -05:00
Brian 36ef54deae remove -Wall, add -DGALLIUM_CELL 2007-12-10 14:10:29 -07:00
Dan Nicholson 88586332d3 autoconf: Allow static library builds
Allow the user to specify that they want static libraries through the
--{enable,disable}-{static,shared} switches like libtool. The mesa build
only allows for one at a time, so static will be chosen if someone has
passed --enable-static or --disable-shared.

This also allows the mklib options to be set at build time. This allows
-static to be set for mklib, but any platform specific settings are
allowed by setting MKLIB_OPTIONS for configure.

Handling of the program libraries through the APP_LIB_DEPS variable is
pretty ugly, but it seems to work.
2007-12-07 14:34:27 -08:00
Dan Nicholson 6689f9ebcb autoconf: Configure the osmesa channel size for OSMesa16 and OSMesa32
Allow the user to specify channel bits of 16 or 32 to enable OSMesa16 or
OSMesa32 instead of the default OSMesa. This option is controlled
through the option --with-osmesa-bits=BITS and is only honored when the
driver is osmesa.

The osdemos are not enabled in the 16 or 32 bit case because the
Makefile is currently hardcoded to link to -lOSMesa.
2007-12-07 14:34:27 -08:00
Dan Nicholson 44d9914b29 autoconf: Add support for shared DRI build on linux and freebsd
Added autoconf bits to allow using DRI as the driver through the option
--with-dri-driver=DRIVER. The options are x11 (default) and dri. Three
DRI specific options for controlling the driver directory, direct
rendering and TLS are also added.

The DRI will probably not work for platforms besides linux and freebsd.
2007-12-07 14:34:27 -08:00
Dan Nicholson dca1b796b7 autoconf: Initial support for an autoconf configuration
This adds the initial support for using autoconf configuration. Support
is available for shared Xlib driver builds. Later this will be extended
to dri and osmesa-only builds and possibly targetting non-X backends.
Support for static library builds will also be added.

The configure script fills in the autoconf config. This is then used by
running `make autoconf' after ./configure.

Testing has been done on Linux/GNU. The configure script tries to
faithfully reproduce the current configs/linux* and configs/freebsd*.
Other platforms can be handled later by adding similar statements and
feature tests.

Pkg-config is used to search for packages when possible. This makes the
build much more flexible and robust to the user's configuration. This
requires that the pkg-config autoconf macros pkg.m4 are included in
aclocal.m4. This requires autoconf and aclocal from autoconf and
automake, respectively.
2007-12-07 14:34:27 -08:00
Dan Nicholson f1efacb92b Make osdemos linking like other programs
Most of the programs list their dependencies on the Mesa libraries in
their Makefiles. This works with the default configuration where
APP_LIB_DEPS only lists external libraries. This changes the
linux-osmesa configs and the osdemos Makefile to follow that convention.

Some cleanup of the Makefile is also added to refer to the GL libraries
through the existing variables rather than hardcoding their names.
2007-12-07 14:10:27 -08:00
Dan Nicholson 6aaf9bdd41 configs: Fix linking with static libGL and --as-needed
Linking of the programs breaks when using a static libGL and the GNU ld
option --as-needed. This is because libXext is needed for the XShm
functions.
2007-12-07 11:49:40 -08:00
Brian 5935626818 Add dependency checking for Cell driver sources. 2007-12-05 14:57:19 -07:00
Brian ce98779571 glut doesn't need -lXt 2007-12-03 12:00:28 -07:00
Brian 91692fce20 added -fPIC 2007-12-02 15:34:27 -07:00
Brian c27082995d don't build libglw 2007-12-02 15:34:14 -07:00
Brian 88b715b049 Initial Cell driver infrastructure.
No real code yet.  Just stand-ins and make/build infrastructure.
2007-12-02 15:23:51 -07:00
Brian 233c374d02 glut doesn't need -lXt 2007-12-02 15:20:13 -07:00
Dan Nicholson 01b18abf93 Add -fno-strict-aliasing workaround for all GCC targets
Use a GCC option to work around aliasing bugs. See commit 013dbcd for
more details.
2007-11-01 06:03:31 -07:00
Dan Nicholson dbcd20f1c2 configs: Set -fexceptions for GLUT on linux-dri like other targets
Quite a while ago, the GCC option -fexceptions was added for building
libglut. See here:

  http://article.gmane.org/gmane.comp.video.mesa3d.devel/9499

This was missing in the linux-dri targets.
2007-10-31 16:18:29 -07:00
Dan Nicholson c3b5adaa9a configs: Always use -fPIC for shared libraries, never for static
Mesa currently disables -fPIC for DRI on x86, but most Linux distros are
re-enabling -fPIC for all DRI arches. Let's just do that here since
that's normally what's wanted for shared libraries. Some justification:

http://bugs.gentoo.org/show_bug.cgi?id=110840#c9

On the other hand, position-independent code is only necessary when
building shared libraries, so disable it for the static cases.
2007-10-31 14:19:20 -07:00
Dan Nicholson 013dbcd611 Add -fno-strict-aliasing workaround for Linux GCC targets
Most Linux distros work around aliasing problems in Mesa by compiling
with the GCC option -fno-strict-aliasing. Two examples:

  https://bugs.freedesktop.org/show_bug.cgi?id=6046
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=394311

This makes -fno-strict-aliasing the default with a comment that
developers should consider commenting it out. There is a already a note
about these bugs in docs/helpwanted.html.
2007-10-31 09:47:39 -07:00
Dan Nicholson 06ca14543e Build xdemos programs by default on linux-dri
Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.
2007-10-29 11:43:20 -07:00
Dan Nicholson 3b9e28d507 linux-dri-xcb: Fix undefined refs when linking with libGL
GL_LIB_DEPS was missing -lXdamage and -lXfixes, which was causing
linker errors when trying to build the programs.
2007-10-29 11:17:04 -07:00
Dan Nicholson 162914675a update APP_LIB_DEPS for static library configs (patch 3/3) 2007-10-29 09:05:13 -06:00
Dan Nicholson 9ef1d9f03a simplify APP_LIB_DEPS (patch 2/3) 2007-10-29 09:04:30 -06:00
Dan Nicholson 9514209593 configs: Fix linux-static to link correctly
The linux-static target was missing necessary libraries and hardcoding
their location to /usr/X11R6/lib. This makes it comparable to the x86
and x86-64 static targets.
2007-10-26 15:46:37 -07:00
José Fonseca 1d2ff452d4 Expand pkg-config flags before invoking the compiler.
This allows IDEs such as Eclipse to get the correct c-preprocessor flags used
from the build output.
2007-10-25 23:37:25 +01:00
Michel Dänzer 8568fadaf2 LLVM requires linking with the C++ compiler.
It's basically luck if it works with the C compiler on some platforms...
2007-10-25 18:26:26 +02:00
Alex Neundorf cae5b7f1e3 added catamount-osmesa-pgi config 2007-10-24 16:31:22 -06:00
Zack Rusin d76a7b61bb Cleanup some code. 2007-10-24 11:21:05 -04:00
Zack Rusin b04430efd9 Introduce linux-llvm target. Remove the llvm code from the default build for now.
Cleanup some of the debugging output.
2007-10-24 11:21:04 -04:00
Zack Rusin 2dbba8b024 Implement the conversion and do the initial execution pass. 2007-10-24 11:21:03 -04:00
Zack Rusin b2e529982e Initial stab at LLVM integration. 2007-10-24 11:21:03 -04:00
Eric Anholt ffa94e5b1e FreeBSD: more /usr/X11R6->/usr/local 2007-10-04 12:28:48 -07:00
Dan Nicholson 2a3e33865d add support for LDFLAGS env var 2007-09-28 18:42:21 -06:00
José Fonseca 59424e2d34 Update x86's static and profile configs. 2007-09-28 18:18:50 +01:00
Eric Anholt b2c8b1385a FreeBSD: Chase /usr/X11R6 death (replaced by everything in one prefix). 2007-09-27 15:11:45 -07:00
Eric Anholt 8cf9085bc7 Move i915tex driver into place as just i915. 2007-09-24 10:03:25 -07:00
Eric Anholt 8fba8d2018 Remove the old i915 driver now that i915tex works without TTM. 2007-09-24 09:56:40 -07:00
Brian 6016de689f fix -D_BSD_SOURC 2007-09-20 18:42:47 -06:00
Brian 58484dc00a Added bluegene-xlc-osmesa config (Alexander Neundorf) 2007-09-20 15:09:57 -06:00
José Fonseca 83a674a7af Update linux-profile config. 2007-09-19 23:48:07 +01:00
Eric Anholt eecec25478 Add missing -g in FreeBSD OPT_CFLAGS 2007-09-19 10:51:07 -07:00
Brian a17d5361b2 remove the -DMESA flags 2007-08-20 17:02:27 -06:00
Brian 3fc926f374 Remove many dependencies on mesa headers.
To build with mesa, need -DMESA in makefile/config file.
2007-08-16 18:11:55 -06:00
Keith Whitwell 8a475cb791 Rename drivers/dri/i915pipe --> drivers/dri/intel_winsys.
This is appropriate as this is not a "pipe driver for the i915" as the
old name would suggest, but rather a dri driver that can provide "winsys"
backends to softpipe/i915/i965/etc pipe drivers, running under the
intel DDX, drm, etc.

It also frees up the i915pipe name for something more appropriate, ie
mesa/pipe/i915pipe.
2007-08-08 09:42:19 +01:00
Brian 23f71f2ea5 add OSMESA_LIB_NAME 2007-08-03 10:08:39 -06:00
Brian 002942913d added -lm 2007-08-03 07:24:11 -06:00
Brian 2457f4cf67 OSmesa on BlueGene (Alexander Neundorf) 2007-08-02 14:22:02 -06:00
Brian 6fae66715b fix some FreeBSD issues 2007-07-31 14:57:37 -06:00
Keith Whitwell b4c18efcd0 Build the "pipe" version of the i915tex driver.
This hands all rendering off to the softpipe rasterizer.
2007-07-31 20:22:49 +01:00
Brian 58f9f96c68 New sunos5-v9-cc-gcc config (Roland Egger) 2007-07-30 09:01:02 -06:00
michal e0a26b0467 Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch 2007-07-27 10:05:40 +02:00
Zhang 76fb808910 Fix a number of MINGW32 issues 2007-07-21 11:28:06 -06:00
michal 3b8bc1f467 Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch 2007-07-06 17:53:44 +02:00
Eric Anholt 1a413b4d77 Use -pthread instead of -lpthread on FreeBSD. 2007-06-22 11:19:42 -07:00
Keith Whitwell f185411637 Only build i915tex 2007-06-20 23:17:13 +01:00
Dave Airlie b2dde0a783 miniglx: update defines in linux-solo config 2007-06-05 09:36:28 +10:00
Brian c128c3ce8c master/trunk is now for Mesa 7.1 devel: bump versions 2007-05-14 14:30:36 -06:00
Dave Airlie b3378f6cc5 nouveau: disable nouveau build by default
Until this is API/ABI stable building it by default isn't a good idea.
2007-05-05 15:43:01 +10:00
Brian ae5f67575d Makefile clean-ups for miniglx. 2007-05-04 18:27:12 -06:00
Brian e371a5f084 Version bumps for 7.0 2007-04-27 17:01:23 -06:00
Jeremy Kolb 838a2a2633 Make xcb backend compile.
Add nouveau to match linux-dri config.
2007-04-20 21:53:38 -04:00
Brian 5dba996dba add glsl to PROGRAM_DIRS 2007-04-08 15:50:31 -06:00
Brian 20d85c609a bump version to 6.5.3 to match version.h 2007-03-28 09:07:41 -06:00
Brian c4ac5ac9d7 Overhaul of error handling. 2007-02-26 14:32:53 -07:00
Keith Whitwell 3bfbe63806 New debug config for linux-dri 2007-01-17 08:44:13 +00:00
Eric Anholt c2b185cff8 Add reporting of damage by DRI drivers when the extension support is available.
With this, tools like ximagesrc in gstreamer correctly see updates from GL
rendering.  Support requires that the Xdamage library be current (but will be
disabled if not present) plus a new X Server with support for the new
XDamagePost request.  libGL now has a new interface version, and also links
against libXdamage and libXfixes to support it, but backwards compatibility
is retained.

Currently, all drivers report damage at SwapBuffers time through common code --
front buffer rendering doesn't result in damage being reported.  Also, the
damage is against the root window, as our drivers don't yet render to backing
store when they should (composited environments).
2007-01-05 18:23:57 -08:00
Michel Dänzer 14f92636b0 Make git ignore files only generated at build time. 2006-12-06 14:17:56 +01:00
Gary Wong 50a81669ba Add i915tex and i965. 2006-12-02 02:20:05 +00:00
Sean D'Epagnier 10cbd089ae the following improvements to linux-fbdev:
1. updated makefiles to build libOSMesa as well as libGL

these are improvements to fbdev-glut
1. mouse cursor will timeout and be invisible if not being used
2. do not restore colormaps to truecolor targets, this causes problems at
   exit on my g450
3. fixed a crash when cleaning up from failure by munmaping what had not
   yet been mmaped
4. Resize event handling is improved, the resize function is not invoked
   from a signal handler now.
5. The main loop can detect if it is running very fast (greater than 2khz)
6. keyboard up and special up events are generated from stdin input mode
   and if it is also not redrawing, it sleeps
7. corrections in escape sequences for function keys for stdin input
2006-11-30 03:25:28 +00:00
Brian Paul bdb1c3882f need to specify Xlibs with APP_LIB_DEPS 2006-11-18 16:43:13 +00:00
Keith Whitwell 48e6fff3a9 merge the (rest of) texmem branch 2006-11-01 14:26:10 +00:00
Brian Paul 79b5d3e539 remove some debug/test changes 2006-10-19 20:11:15 +00:00
Brian Paul 464fcd0dd8 New bin/minstall script - a minimal replacement for 'install'.
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-10-19 20:09:05 +00:00
Ian Romanick f3f51bc844 Fix bug #4681.
glDeleteTextures and glDeleteTexturesEXT were erroneously listed as
aliases of each other.  For anything /except/ GLX protocol they are
aliases.  This set of changes allows functions that are functionally
identical but have different GLX protocol to be listed as aliases.

When building with GLX_INDIRECT_RENDERING set, different static
functions are used.  These functions determine whether the current
context is direct rendering or not.  If the context is direct
rendering, the aliased function (e.g., glDeleteTextures in the case of
glDeleteTexturesEXT) is called.  If the context is not direct
rendering, the correct GLX protocol is sent.

For a deeper explanation of what is changed, please see:
http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions
2006-10-11 22:37:14 +00:00
Brian Paul 0a0cd3a8ae Updates for XCB. Bug 8560. 2006-10-09 14:55:46 +00:00
Jeremy Kolb b68788a1ca Update linux-dr-xcb config file to use LIBDRM_CFLAGS 2006-09-26 23:45:28 +00:00
Brian Paul 4af404038c bump version to 6.5.2 2006-09-21 23:02:21 +00:00
Brian Paul 408ce7e861 added LIBDRM_CFLAGS (Javier Villavicencio) 2006-09-19 22:43:41 +00:00
Brian Paul dc4bf43898 fix CFLAGS (bug 8344) 2006-09-19 16:31:37 +00:00
Brian Paul 2216aac8ea comment out EXTRA_LIB_PATH, ?= causes problems on HP-UX 2006-09-06 13:56:26 +00:00
Brian Paul bb2180dca3 Fixes from Christopher Bell:
Use -O instead of +O3 or +O2.
Remove +Oaggressive.
Replace -Aa with -Ae.
2006-09-06 13:49:17 +00:00
Ian Romanick ce9767f863 Make sure that _GNU_SOURCE is enabled in the linux configs that set
HAVE_POSIX_MEMALIGN.  This eliminates a compiler warning.  Also,
clean up some crufty linux-sparc* configs.
2006-08-24 18:06:37 +00:00
Brian Paul 92c43b110c Fix-ups for linux-fbdev config. No longer build Xlib driver sources. 2006-08-18 20:20:28 +00:00
Sean D'Epagnier 7e4152f0ed The driver now compiles correctly without any x headers or libraries installed
The bitmap and stroke code can't be shared with glx anymore because of this.

The model for the mini teapot is restored and I have tested it to work with
linux-fbdev and linux-solo

The driver recognizes 32bpp where there is no alpha (my radeon 7500)  It also
sets the correct number of cmap entrees (instead of 256 which can be an error)
2006-08-18 10:38:15 +00:00
Ian Romanick a7d0256745 When available, which is most of the time, use posix_memalign to implement
_mesa_align_malloc and friends.
2006-08-16 17:06:08 +00:00
Adam Jackson be85fde82b linux-indirect target fixes. 2006-08-10 20:19:57 +00:00
Eric Anholt 9f344b3e7d Add Intel i965G/Q DRI driver.
This driver comes from Tungsten Graphics, with a few further modifications by
Intel.
2006-08-09 19:14:05 +00:00
Sean D'Epagnier 6545ebbd8d Modified config to use glut/fbdev, added demo and sample directories. 2006-08-05 08:55:10 +00:00
Brian Paul 459db7bd72 bump MESA_TINY to 1 2006-07-20 04:34:36 +00:00
Brian Paul 883f9891cb LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
Brian Paul 27908d2bcb update comment, APP_LIB_DEPS 2006-07-07 14:32:47 +00:00
Brian Paul f385cf115a simple libOSMesa.so-only config, no X 2006-07-04 16:49:41 +00:00
Brian Paul 2922aa236f fix linking bug (bug 7405) 2006-07-03 23:12:16 +00:00