Marc Dietrich
995c342018
autoconf: fix build breakage
2010-01-02 10:33:15 -07:00
José Fonseca
c847a13d38
gallium: Generate a single library for auxiliaries with Make too.
2010-01-01 12:16:19 +00:00
José Fonseca
fc8e0b97e5
gallium: Remove the sct module.
...
Not used, and its functionality is now addressed by
pipe_context::is_texture/buffer_referenced callbacks.
2010-01-01 12:16:19 +00:00
Brian Paul
25024d9482
Merge branch 'mesa_7_7_branch'
...
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
Brian Paul
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
2009-12-27 15:31:08 -07:00
Brian Paul
cb504a026c
cell: add glsl to SRC_DIRS
2009-12-27 10:24:12 -07:00
Vinson Lee
19a40524d3
Add gallium to darwin config.
2009-12-22 18:21:41 -08:00
Keith Whitwell
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
Jeremy Huddleston
3839f6768d
darwin: Build glsl
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:44 -08:00
Keith Whitwell
57531baa92
i965g: back out unintentional changes to linux-dri
2009-12-21 19:21:09 +00:00
Keith Whitwell
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
Jeremy Huddleston
f926eff263
darwin: Cleanup CPPFLAGS a bit
...
(cherry picked from commit 4a1e103858
)
2009-12-20 21:36:39 -08:00
Jeremy Huddleston
4a1e103858
darwin: Cleanup CPPFLAGS a bit
2009-12-20 21:32:35 -08:00
Brian Paul
6a7b6a530d
llvmpipe: added linux-llvm-debug configuration
2009-12-18 11:17:06 -07:00
Brian Paul
04794080d2
llvmpipe: change configs/linux-llvm from debug build to optimized build
...
Basically equivalent to the SCons non-debug build now.
2009-12-18 11:13:06 -07:00
Michal Krol
a3eb0f718e
Merge branch 'master' into glsl-pp-rework-2
...
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-12 16:48:32 +01:00
michal
068596c9a7
Build mesa glsl with make.
...
Still don't know how to add glsl to mesa dependencies.
2009-12-10 01:03:15 +01:00
Jeremy Huddleston
da5741cf53
darwin: Cleanup CPPFLAGS a bit
...
(cherry picked from commit 4a1e103858
)
2009-12-20 21:36:56 -08:00
Keith Whitwell
06d3732a90
Merge commit 'origin/mesa_7_7_branch'
...
Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
2009-12-01 10:57:37 +00:00
José Fonseca
5976d8e6f1
configs: Warn about pointer arithmetic.
...
It's not portable. Warn to help catching it early.
2009-11-27 17:06:12 +00:00
Brian Paul
d252f9d278
mesa: bump version to 7.8
2009-11-18 07:26:28 -07:00
Brian Paul
6418ce7df6
mesa: move -ansi -pedantic to CFLAGS
2009-11-17 12:47:54 -07:00
Jakob Bornecrantz
60769b232c
svga: Build svga driver
2009-11-17 03:18:06 +01:00
Chia-I Wu
9f38553018
Update config linux-opengl-es.
...
Build demos that require EGL_MESA_screen_surface, and build egl_i915.so
that supports EGL_MESA_screen_surface.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-10 11:25:00 -07:00
Chia-I Wu
97ea8e9263
Add new config for OpenGL ES.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-06 14:19:24 -07:00
Keith Whitwell
211d7ab22b
i965g: add standalone xlib debug winsys
...
Create a dummy winsys that just debug-prints on calls into the winsys
functions. Will use this to get to the point where we are generating
sane-looking debug dumps and diassembly.
Also fix various warnings generated with the new compiler flags set in
this config.
2009-11-04 13:03:35 +00:00
Brian Paul
4bced42341
Merge branch 'mesa_7_6_branch'
2009-11-03 09:54:09 -07:00
Chow Loong Jin
35506dec67
Add --with-dri-searchpath argument
...
* Add an extra argument to configure which allows for specifying
different DRI driver search paths to libGL (FDO #24766 )
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-10-30 06:00:13 -07:00
Keith Whitwell
7ee60648a3
i965g: hook into build system
2009-10-24 11:55:25 +01:00
Corbin Simpson
fd7ee2bcb7
Kill off trident.
...
Hm. I could have said "chew trident and spit it out," or perhaps
"spear trident," instead. Dohoho.
2009-10-22 12:57:13 -07:00
Corbin Simpson
8e4657a9d4
Nuke s3v.
...
As per FDO #17889 .
2009-10-22 12:29:30 -07:00
Jakob Bornecrantz
f00da2a3ff
i915g: Drop the simple sufix
...
None of the other driver have a silly sufix,
so just drop it. Nothing new added in this commit
or any other commit but this is better marketing.
2009-10-05 19:48:08 +01:00
Brian Paul
24f31ab861
mesa: add objviewer to PROGRAM_DIRS
2009-10-01 13:14:50 -06:00
Brian Paul
69a3043f41
mesa: bump version to 7.6.1
2009-09-29 09:36:06 -06:00
Younes Manton
f547472bfa
g3dvl: pipe_video_context interface, softpipe impl, auxiliary libs
2009-09-27 19:49:06 -04:00
Brian Paul
41bbc83951
Merge branch 'mesa_7_6_branch'
2009-09-15 09:47:35 -06:00
Brian Paul
5d526ed21a
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-15 09:45:18 -06:00
Dan Nicholson
9c8b69302c
Use CFLAGS as HOST_CFLAGS by default
...
Unless we're cross compiling, the HOST_CFLAGS should be the same as the
normal CFLAGS. This allows the x86 and x86_64 asm to be built correctly
with a native compiler using -m32/-m64.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-09-12 09:35:43 -07:00
Brian Paul
f78eafcacb
mesa: bump version to 7.7
2009-09-08 16:46:06 -06:00
Brian Paul
42943a4cf9
mesa: bump version to 7.5.2
...
I'm not 100% sure there'll be a 7.5.2 release, but just in case.
2009-09-08 14:45:27 -06:00
Brian Paul
d6d4f8b66e
llvmpipe: use the udis86 lib to print the x86 assembly code
2009-08-29 09:21:36 +01:00
Brian Paul
4c6fd574b1
llvmpipe: re-enable other gallium drivers
...
No more symbol collisions between drivers, AFAICT.
2009-08-29 09:21:35 +01:00
Brian Paul
1ea1cd8468
llvmpipe: repurpose linux-llvm config to build the llvmpipe driver
...
The gallivm module is no longer built. If/when gallivm is resuscitated we
can revisit this.
2009-08-29 09:21:35 +01:00
Chia-I Wu
5a459d58fc
egl: Remove dependency on libX11.
...
libX11 is used to determine the screen number, which is in turned used
to determine the DRI driver. However, the sysfs interface for
determining the DRI driver is gone, and no working driver depends on
this mechanism.
Display string parsing is moved to a new function,
_eglSplitDisplayString.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-08-21 08:34:34 -06:00
Brian Paul
9c4b877519
mesa: bump version to 7.5.1
2009-07-22 12:46:53 -06:00
Chia-I Wu
75da80b295
egl: Support per-thread info.
...
This commit introduces a "current" system to manage per-thread info. It
uses TLS, if GLX_USE_TLS is defined, or pthread, if PTHREADS is defined.
If none of them are defined, it uses a dummy implementation that is just
like before.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-07-17 11:41:02 -06:00
Vinson Lee
d3b46fc77f
configs/darwin: Set CXX to g++.
2009-06-26 12:36:45 -06:00
Jakob Bornecrantz
d60b2c6855
identity: Add new identity driver
...
This driver does no transformation of the gallium calls
going to the real driver, like the identity matrix. It is
intended to be the basis for transforming and/or debug
drivers like trace and rbug.
Authors of this patch are:
Michal Krol, orignal heavy lifting.
José Fonesca, object wrapping code stolen from trace.
Jakob Bornecrantz, put it all toghether and renamed a stuff.
2009-06-24 13:04:56 +02:00
Dave Airlie
545e574cd9
Merge remote branch 'origin/master' into radeon-rewrite
2009-06-07 16:51:32 +10:00
Dan Nicholson
bc302b2a33
Use separate $(MINSTALL) for installing libraries
...
The special feature of bin/minstall to copy symlinks is only ever needed
when installing libraries which may have .so symlinks. All the headers
and directories can use a normal install program.
These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the
user (or autoconf) to override installing normal files as they please.
An autoconf check for the install program has been added and will be
used in preference to minstall when available.
Fixes bug 16053.
2009-06-01 06:32:52 -07:00
Jakob Bornecrantz
dfa4ebcbcc
rbug: Add Gallium Remote Debugger Protocol code
...
This is the (de)marshalling and connection managment code
2009-06-01 11:19:39 +01:00
Michel Dänzer
b9bd1abf26
Merge branch 'master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c
2009-05-20 17:00:48 +02:00
Brian Paul
edfbf7dccb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-18 10:36:50 -06:00
Brian Paul
df37cde309
mesa: added linux-osmesa-static config
...
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-18 08:47:22 -06:00
Jerome Glisse
221b30d595
Merge commit 'origin/master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
2009-05-10 16:57:22 +02:00
Zack Rusin
fbceedd2de
actually add debug to the debug config
2009-05-01 12:51:01 -04:00
Brian Paul
666e5bf4a6
mesa: bump version to 7.6 (devel)
2009-05-01 09:22:20 -06:00
Brian Paul
3eafd25aa3
configs: bump MESA_MINOR to 5
2009-05-01 09:15:14 -06:00
Brian Paul
aef475c889
mesa: update linux-static, linux-x86-static configs
2009-04-30 17:04:01 -06:00
Dave Airlie
466c78c935
Merge remote branch 'origin/master' into radeon-rewrite
2009-04-22 21:41:57 +10:00
Brian Paul
4c13cb65a0
dri: build DRI swrast driver too
2009-04-17 16:10:26 -06:00
Dave Airlie
407e8ae5b1
Merge remote branch 'main/master' into radeon-rewrite
...
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
2009-03-20 10:52:17 +10:00
Brian Paul
8e1b2bac8b
config: add -Wdeclaration-after-statement to linux config
...
Should help to catch Windows build issues earlier.
2009-03-12 17:21:20 -06:00
Kamalneet Singh
37fdfe89dd
linux-llvm config: Linking with required llvm libs
2009-03-09 17:42:59 +01:00
Jeremy Huddleston
7817fea0b6
Updated darwin config for when X11 is not in the same location as we're installing to
2009-03-06 11:21:45 -05:00
Joel Bosveld
8acca48cd5
st/xorg: Install to XORG_DRIVER_INSTALL_DIR
2009-03-06 01:31:49 +01:00
Dan Nicholson
53b3734511
autoconf: Fixup EGL build
...
This gets the needed libraries pulled in for libEGL for autoconf.
2009-02-25 17:45:34 -08:00
Brian Paul
c34c78b853
egl: use new EGL_LIB_DEPS to pass library dependencies to mklib when building libEGL
...
EGL_LIB_DEPS may need fine-tuning for some platforms. It's only defined
in configs/default ATM.
2009-02-25 08:41:13 -07:00
Jakob Bornecrantz
d67bd60ecf
gallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/
2009-02-20 11:25:55 +00:00
Jakob Bornecrantz
9c9fcc83c0
gallium: Renable pipe drivers disabled during vbuf changes
...
i965simple is not enabled because it is still broken.
2009-02-19 23:16:57 +01:00
Dave Airlie
b0e8ac8fd2
radeon: add cflags to decide whether to link libdrm_radeon or not.
...
You don't need libdrm_radeon for the legacy driver to build,
only for the experimental mm/cs paths.
2009-02-15 17:03:47 +10:00
Keith Whitwell
7ca78a07b3
softpipe: update to new draw interfaces
2009-02-17 12:20:05 +00:00
Dan Nicholson
c5bae14245
autoconf: Adjust to new asm SOURCES variables
...
Commit 90b2beb661
changed the assembly
variables. Without this change, the glapi assembly wasn't being built
when it was supposed to, resulting in missing symbols in libGL.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-11 11:58:39 -08:00
Brian Paul
0996a23e3d
cell: asst build fixes in linux-cell config
...
Add -D_SVID_SOURCE to silence warnings when building glx files.
Don't build the non-gallium drivers.
2009-02-10 19:34:08 -07:00
Jakob Bornecrantz
7e54d7d3d6
gallium: Update autoconf to latest gallium build
2009-02-11 02:45:15 +01:00
Jakob Bornecrantz
e94b4dd4f0
gallium: Disable nouveau by default
...
Most piep drivers should be able to build by default, but since
the nouveau ones depend drm they can't be enabled by default.
2009-02-11 02:43:27 +01:00
Jakob Bornecrantz
767b1acbb7
mesa: Build both software rasterizers for debug
...
But put the gallium one in lib/gallium
2009-02-10 17:43:25 +01:00
Jakob Bornecrantz
43e6272ae5
gallium: Introduce new subdirs build variables
...
(based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
2009-02-10 16:23:02 +01:00
Jakob Bornecrantz
7fad277bbb
Revert "cell: update linux-cell config"
...
This reverts commit 22c6c1eaad
.
Need to revert this since we reverted commited this depended on.
2009-02-10 16:22:32 +01:00
Jakob Bornecrantz
b96d50da8b
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
...
This reverts commit abbe96cb6e
.
It only reverts parts of the commit the other parts where related to
libmesagallium changes.
2009-02-10 16:22:19 +01:00
Brian Paul
e13593678f
re-add MSAA support
...
(cherry picked from commit f7d80aa006
)
This also involved adding the new MSAA fields to driCreateConfigs().
Also, re-add prog_instructions->Sampler field for i965 driver. Will
have to revisit that.
2009-02-09 11:16:20 -07:00
Brian Paul
22c6c1eaad
cell: update linux-cell config
2009-02-09 10:42:34 -07:00
Brian Paul
abbe96cb6e
mesa: added new linux-gallium and linux-gallium-debug configs
...
Also, remove gallium-related things from configs/default. They're in
linux-gallium now.
So the default builds are the same as they have been for Mesa/master.
2009-02-09 10:17:58 -07:00
Brian Paul
e97681c7f5
mesa: merge gallium-0.2 into gallium-master-merge
...
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Siddhartha Chaudhuri
1a46c8a062
mesa: autoconf fixes for OS X
...
See bug report 17566.
2009-02-09 07:59:32 -07:00
Corbin Simpson
5538323005
Readd trace to list of default pipe drivers.
...
Looks like the gallium-0.2-radeon merge clobbered it.
2009-02-06 13:36:31 -08:00
Corbin Simpson
4683fc94f5
Merge branch 'gallium-0.2-radeon' into gallium-0.2
2009-02-06 13:34:04 -08:00
Corbin Simpson
0bf152e0be
Remove r300 from default build.
2009-02-06 13:27:51 -08:00
Keith Whitwell
3120894c6d
gallium: add new aux lib for index list translations
...
Could this be the ultimate index list translating utility? Maybe, but it
doesn't yet include support for splitting primitives.
Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks. Relies on python-generated code.
2009-02-05 16:04:38 +00:00
Corbin Simpson
fbeeb66757
r300, amd: Make everything build. (Not necessarily work, mind you.)
...
Lots of structural work, especially in getting the two parts to talk nicely.
Todo:
- Get damn blitter working.
- Add CS flush.
- Reverse order of above two items.
2009-02-01 23:30:22 -08:00
Jerome Glisse
14f79d46a5
gallium autoconf/automake
2009-02-01 23:30:19 -08:00
José Fonseca
fcf9353fea
glew: Build it as a static lib.
2009-01-24 16:54:59 +00:00
José Fonseca
57d00016ca
glew: Initial import.
...
From glew 1.5.1 release.
2009-01-23 12:32:35 +00:00
Keith Whitwell
b5db6b039c
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
2009-01-19 10:15:04 +00:00
Michel Dänzer
359bbe7432
gallivm: Explicitly specify the LLVM components we need.
2009-01-12 12:37:13 +01:00
Brian Paul
a129c7268a
cell: fix breakage from xlib re-org
...
Some of these fixes are quick band-aids for now.
2009-01-08 08:30:11 -07:00
Keith Whitwell
002dfb12fc
gallium: split driver-independent code out of xlib winsys
...
Place in new xlib state-tracker. This is a statetracker for the GLX API.
2009-01-08 14:10:56 +00:00
Alan Hourihane
a22d865f93
Merge commit 'origin/master' into gallium-0.2
2008-12-15 11:16:03 +00:00
Dan Nicholson
8be02fc8c6
Add OSMesa pkg-config file
...
This makes the GLU .pc file a little simpler, too.
2008-12-14 09:35:29 -08:00
Dan Nicholson
71e208bafe
Add more package metadata to the pkg-config files
...
The pkg-config files have been filled in more thoroughly to allow users
to use mesa more effectively. By adding metadata to Requires.private,
Libs.private and Cflags, we can ensure that all the libraries and
headers will be found in all situations. However, the full substitutions
are only done when using the configure script.
This also fixes the glu pkg-config file to account for using GL or
OSMesa.
Fixes bug 18161.
2008-12-14 08:47:03 -08:00
Alan Hourihane
33a1f495d4
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
Jeremy Huddleston
f18880038b
darwin: Use -Os instead of -O2
...
(cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273)
2008-12-03 17:03:35 -08:00
Brian Paul
4356d349ad
cell: only build Cell and softpipe drivers
2008-11-21 13:57:57 -07:00
Alan Hourihane
af1ce2375e
build default set of progs + egl
2008-11-13 19:38:18 +00:00
Pekka Paalanen
20ff08cd86
Fix configs/linux-dri to build winsys again.
...
SRC_DIRS was being reset, which left winsys unbuilt.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-13 20:44:55 +02:00
Stephane Marchesin
42330d929c
Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa into gallium-0.2
2008-11-13 18:06:06 +01:00
Pekka Paalanen
5aaeb13a76
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
* commit 'origin/gallium-0.1':
Mesa: fix number of buffers in st_draw_vbo().
Nouveau: fix nv20_vertex_layout()
Nouveau: update nv20 miptree according to nv40.
Nouveau: build, link and use nv20.
Nouveau: name replace for nv20.
Nouveau: Rename nv20/ files as nv20.
Nouveau: copy nv30_vertprog.c to nv20.
Nouveau: start nv20 by copying the nv10 tree.
2008-11-12 23:13:22 +02:00
Brian Paul
a35210b516
cell: added -Wmissing-prototypes
2008-11-12 11:06:48 -07:00
Ben Skeggs
32e6be6362
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
2008-11-10 15:53:51 +11:00
Pekka Paalanen
0da43322bb
Nouveau: build, link and use nv20.
...
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-08 18:32:33 +02:00
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