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
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
cb504a026c
cell: add glsl to SRC_DIRS
2009-12-27 10:24:12 -07:00
19a40524d3
Add gallium to darwin config.
2009-12-22 18:21:41 -08:00
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
3839f6768d
darwin: Build glsl
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:44 -08:00
57531baa92
i965g: back out unintentional changes to linux-dri
2009-12-21 19:21:09 +00:00
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
f926eff263
darwin: Cleanup CPPFLAGS a bit
...
(cherry picked from commit 4a1e103858
2009-12-20 21:36:39 -08:00
4a1e103858
darwin: Cleanup CPPFLAGS a bit
2009-12-20 21:32:35 -08:00
6a7b6a530d
llvmpipe: added linux-llvm-debug configuration
2009-12-18 11:17:06 -07:00
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
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
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
da5741cf53
darwin: Cleanup CPPFLAGS a bit
...
(cherry picked from commit 4a1e103858
2009-12-20 21:36:56 -08:00
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
5976d8e6f1
configs: Warn about pointer arithmetic.
...
It's not portable. Warn to help catching it early.
2009-11-27 17:06:12 +00:00
d252f9d278
mesa: bump version to 7.8
2009-11-18 07:26:28 -07:00
6418ce7df6
mesa: move -ansi -pedantic to CFLAGS
2009-11-17 12:47:54 -07:00
60769b232c
svga: Build svga driver
2009-11-17 03:18:06 +01:00
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
97ea8e9263
Add new config for OpenGL ES.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-06 14:19:24 -07:00
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
4bced42341
Merge branch 'mesa_7_6_branch'
2009-11-03 09:54:09 -07:00
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
7ee60648a3
i965g: hook into build system
2009-10-24 11:55:25 +01:00
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
8e4657a9d4
Nuke s3v.
...
As per FDO #17889 .
2009-10-22 12:29:30 -07:00
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
24f31ab861
mesa: add objviewer to PROGRAM_DIRS
2009-10-01 13:14:50 -06:00
69a3043f41
mesa: bump version to 7.6.1
2009-09-29 09:36:06 -06:00
f547472bfa
g3dvl: pipe_video_context interface, softpipe impl, auxiliary libs
2009-09-27 19:49:06 -04:00
41bbc83951
Merge branch 'mesa_7_6_branch'
2009-09-15 09:47:35 -06:00
5d526ed21a
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
2009-09-15 09:45:18 -06:00
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
f78eafcacb
mesa: bump version to 7.7
2009-09-08 16:46:06 -06:00
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
d6d4f8b66e
llvmpipe: use the udis86 lib to print the x86 assembly code
2009-08-29 09:21:36 +01:00
4c6fd574b1
llvmpipe: re-enable other gallium drivers
...
No more symbol collisions between drivers, AFAICT.
2009-08-29 09:21:35 +01:00
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
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
9c4b877519
mesa: bump version to 7.5.1
2009-07-22 12:46:53 -06:00
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
d3b46fc77f
configs/darwin: Set CXX to g++.
2009-06-26 12:36:45 -06:00
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
545e574cd9
Merge remote branch 'origin/master' into radeon-rewrite
2009-06-07 16:51:32 +10:00
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
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
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
edfbf7dccb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
2009-05-18 10:36:50 -06:00
df37cde309
mesa: added linux-osmesa-static config
...
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-18 08:47:22 -06:00
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
fbceedd2de
actually add debug to the debug config
2009-05-01 12:51:01 -04:00
666e5bf4a6
mesa: bump version to 7.6 (devel)
2009-05-01 09:22:20 -06:00
3eafd25aa3
configs: bump MESA_MINOR to 5
2009-05-01 09:15:14 -06:00
aef475c889
mesa: update linux-static, linux-x86-static configs
2009-04-30 17:04:01 -06:00
466c78c935
Merge remote branch 'origin/master' into radeon-rewrite
2009-04-22 21:41:57 +10:00
4c13cb65a0
dri: build DRI swrast driver too
2009-04-17 16:10:26 -06:00
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
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
37fdfe89dd
linux-llvm config: Linking with required llvm libs
2009-03-09 17:42:59 +01:00
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
8acca48cd5
st/xorg: Install to XORG_DRIVER_INSTALL_DIR
2009-03-06 01:31:49 +01:00
53b3734511
autoconf: Fixup EGL build
...
This gets the needed libraries pulled in for libEGL for autoconf.
2009-02-25 17:45:34 -08:00
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
d67bd60ecf
gallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/
2009-02-20 11:25:55 +00:00
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
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
7ca78a07b3
softpipe: update to new draw interfaces
2009-02-17 12:20:05 +00:00
c5bae14245
autoconf: Adjust to new asm SOURCES variables
...
Commit 90b2beb661
2009-02-11 11:58:39 -08:00
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
7e54d7d3d6
gallium: Update autoconf to latest gallium build
2009-02-11 02:45:15 +01:00
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
767b1acbb7
mesa: Build both software rasterizers for debug
...
But put the gallium one in lib/gallium
2009-02-10 17:43:25 +01:00
43e6272ae5
gallium: Introduce new subdirs build variables
...
(based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
2009-02-10 16:23:02 +01:00
7fad277bbb
Revert "cell: update linux-cell config"
...
This reverts commit 22c6c1eaad
2009-02-10 16:22:32 +01:00
b96d50da8b
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
...
This reverts commit abbe96cb6e
2009-02-10 16:22:19 +01:00
e13593678f
re-add MSAA support
...
(cherry picked from commit f7d80aa006
2009-02-09 11:16:20 -07:00
22c6c1eaad
cell: update linux-cell config
2009-02-09 10:42:34 -07:00
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
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
1a46c8a062
mesa: autoconf fixes for OS X
...
See bug report 17566.
2009-02-09 07:59:32 -07:00
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
4683fc94f5
Merge branch 'gallium-0.2-radeon' into gallium-0.2
2009-02-06 13:34:04 -08:00
0bf152e0be
Remove r300 from default build.
2009-02-06 13:27:51 -08:00
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
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
14f79d46a5
gallium autoconf/automake
2009-02-01 23:30:19 -08:00
fcf9353fea
glew: Build it as a static lib.
2009-01-24 16:54:59 +00:00
57d00016ca
glew: Initial import.
...
From glew 1.5.1 release.
2009-01-23 12:32:35 +00:00
b5db6b039c
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
2009-01-19 10:15:04 +00:00
359bbe7432
gallivm: Explicitly specify the LLVM components we need.
2009-01-12 12:37:13 +01:00
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
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
a22d865f93
Merge commit 'origin/master' into gallium-0.2
2008-12-15 11:16:03 +00:00
8be02fc8c6
Add OSMesa pkg-config file
...
This makes the GLU .pc file a little simpler, too.
2008-12-14 09:35:29 -08:00
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
33a1f495d4
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
f18880038b
darwin: Use -Os instead of -O2
...
(cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273)
2008-12-03 17:03:35 -08:00
4356d349ad
cell: only build Cell and softpipe drivers
2008-11-21 13:57:57 -07:00
Brian Paul
Vinson Lee
Keith Whitwell
Jeremy Huddleston
Jeremy Huddleston
Michal Krol
michal
José Fonseca
Jakob Bornecrantz
Chia-I Wu
Chow Loong Jin
Corbin Simpson
Younes Manton
Dan Nicholson
Dave Airlie
Michel Dänzer
Jerome Glisse
Zack Rusin
Dave Airlie
Kamalneet Singh
Joel Bosveld
Siddhartha Chaudhuri
Alan Hourihane
Brian Paul