Jerome Glisse
3349517351
noop: make noop useable like trace or rbug
...
If you want to enable noop set GALLIUM_NOOP=1 as an env variable.
You need first to enable noop wrapping for your driver see change
to src/gallium/targets/dri-r600/ in this commit as an example.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2011-01-09 21:04:41 -05:00
Christian König
72e3099155
Merge remote branch 'origin/master' into pipe-video
...
Conflicts:
configure.ac
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/include/pipe/p_format.h
src/gallium/targets/dri-nouveau/Makefile
2011-01-08 13:24:36 +01:00
Pierre Allegraud
8fd8de3995
mesa: fix build for NetBSD
...
See http://bugs.freedesktop.org/show_bug.cgi?id=32859
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-01-06 08:00:01 -07:00
Christoph Bumiller
cd1cf78828
Merge remote branch 'origin/nvc0'
2011-01-04 18:20:05 +01:00
Eric Anholt
bd8e658884
intel: Bump libdrm configure.ac requirement for the gen6 BLT ring support.
2011-01-03 15:04:19 -08:00
Chia-I Wu
ada9c78c29
autoconf: Fix --with-driver=xlib --enable-openvg.
...
st/egl should be enabled with --enable-openvg even the driver is xlib or
osmesa. Also, GLX_DIRECT_RENDERING should not be defined because libdrm
is not checked.
2011-01-04 01:13:49 +08:00
Christoph Bumiller
0f68236a24
Merge remote branch 'origin/master' into nvc0-new
2010-12-19 21:46:33 +01:00
Christian König
772b25e1f3
Merge remote branch 'origin/master' into pipe-video
...
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
2010-12-11 13:43:44 +01:00
Brian Paul
7da704ee72
configure: use llvm-config --cppflags instead of --cflags
2010-12-08 06:45:00 -07:00
Christian König
e6b71530da
Merge remote branch 'origin/master' into pipe-video
...
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
2010-11-21 19:40:52 +01:00
Jerome Glisse
5da246944a
gallium/noop: no operation gallium driver
...
This driver is a fake swdri driver that perform no operations
beside allocation gallium structure and buffer for upper layer
usage.
It's purpose is to help profiling core mesa/gallium without
having pipe driver overhead hidding hot spot of core code.
scons file are likely inadequate i am unfamiliar with this
build system.
To use it simply rename is to swrast_dri.so and properly set
LIBGL_DRIVERS_PATH env variable.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2010-11-15 14:56:40 -05:00
Christoph Bumiller
4c22475383
nvc0: import nvc0 gallium driver
2010-11-12 15:17:40 +01:00
Christian König
195bbe8ce2
Merge remote branch 'origin/master' into pipe-video
2010-11-11 21:07:42 +01:00
Chia-I Wu
dbacbb8219
autoconf: Add --enable-gallium-egl.
...
This option comes handy when we want to build gallium DRI drivers but
not st/egl.
2010-11-10 00:57:49 +08:00
Chia-I Wu
1230050363
autoconf: Tidy configure output for EGL.
...
Prefix EGL driver names by "egl_". Make it clear that EGL_CLIENT_APIS
is only used by egl_gallium.
2010-10-31 21:22:26 +08:00
Chia-I Wu
156e955c25
autoconf: st/vega requires --enable-openvg.
...
Make it a warning for now to smooth the transition.
2010-10-30 14:41:17 +08:00
Chia-I Wu
815faa448c
autoconf: Update configuration info.
...
Output API info first. Move GLU/GLw/GLUT and EGL near driver info.
2010-10-29 12:42:24 +08:00
Chia-I Wu
be5f34a053
autoconf: Better client API selection.
...
Make autoconf decide the client APIs enabled first. Then when OpenGL
and OpenGL ES are disabled, there is no need to build src/mesa/; when
OpenGL is disabled, no $mesa_driver should be built. Finally, add
--enable-openvg to enable OpenVG.
With these changes, an OpenVG only build can be configured with
$ ./configure --disable-opengl --enable-openvg
src/mesa, src/glsl, and src/glx will be skipped, which saves a great
deal of compilation time.
And an OpenGL ES only build can be configured with
$ ./configure --disable-opengl --enable-gles-overlay
2010-10-29 12:10:46 +08:00
Christian König
41ed47d6b8
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
...
Conflicts:
src/gallium/include/pipe/p_format.h
2010-10-28 20:24:56 +02:00
Thomas Balling Sørensen
a565f58eda
vl: enable target va-r600
2010-10-28 13:40:59 +02:00
Kenneth Graunke
3acc826520
Fix build on systems where "python" is python 3.
...
First, it changes autoconf to use a "python2" binary when available,
rather than plain "python" (which is ambiguous). Secondly, it changes
the Makefiles to use $(PYTHON) $(PYTHON_FLAGS) rather than calling
python directly.
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: Matthew William Cox <matt@mattcox.ca>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2010-10-27 12:49:53 -07:00
Thomas Balling Sørensen
990cb62963
vl: commited Orasanu Lucian's patch containing va stubs.
2010-10-27 11:00:11 +02:00
Thomas Balling Sørensen
6ac1bbe21a
vl: pipe-video branch merged with Königs pipe-video branch
2010-10-26 13:44:19 +02:00
Thomas Balling Sørensen
4926c57480
Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video
...
Conflicts:
configure.ac
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
2010-10-26 13:01:40 +02:00
Thomas Balling Sørensen
501ac572c6
vl: va state-tracker configuration scripts
2010-10-24 19:27:29 +02:00
Christian König
4381580936
First xvmc-r600 implementation
2010-10-23 17:47:30 +02:00
Christian König
695cc370a2
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
...
Conflicts:
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
2010-10-12 23:07:29 +02:00
Thomas Balling Sørensen
1218430e12
Merge branch 'master' into pipe-video
...
Conflicts:
configs/linux-dri
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/tests/python/samples/tri.py
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/tests/unit/SConscript
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
2010-10-05 12:04:08 +02:00
Marek Olšák
11eb422a16
configure.ac: do not build xorg-r300g by default
...
NOTE: This is a candidate for the 7.9 branch.
2010-09-28 19:38:40 +02:00
Marek Olšák
a1aec2e2be
configure.ac: look for libdrm_radeon before building gallium/r300,r600
...
NOTE: This is a candidate for the 7.9 branch.
2010-09-28 19:38:39 +02:00
Luca Barbieri
f762f7b85d
mesa: make makedepend an hard requirement
...
Currently makedepend is used by the Mesa Makefile-based build system,
but not required.
Unfortunately, not having it makes dependency resolution non-existent,
which is a source of subtle bugs, and is a rarely tested
configuration, since all Mesa developers likely have it installed.
Furthermore some idioms require dependency resolution to work at all,
such as making headers depend on generated files.
2010-09-27 14:10:18 +02:00
Marek Olšák
85a45dcd5d
Build r300g by default
...
NOTE: This will go to 7.9 as well.
2010-09-24 02:58:50 +02:00
Chia-I Wu
2a910b3396
egl: Enable drm platform by default.
...
This enables EGL_MESA_drm_display for st/egl in the default setup.
2010-09-19 17:35:04 +08:00
Chia-I Wu
e7424d7240
st/egl: Rename kms backend to drm.
...
The main use of the backend is to support EGL_MESA_drm_display. drm
should be a better name.
2010-09-19 17:19:03 +08:00
Kristian Høgsberg
7b34fcc487
configure: Enable -fvisibility=hidden for g++ as well
2010-09-08 20:45:07 -04:00
Jon TURNEY
2b9dac397b
Make XF86VIDMODE extension optional
...
Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded. Also use
that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the
XF86VIDMODE extension is found by pkgconfig.
This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to
be mandatory, but is now optional.
Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the
complier when glxcmds.c is compiled, so are not affected by this change
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-09-07 13:30:19 -04:00
Jon TURNEY
c55a8a73a4
Cygwin: Teach mklib/minstall to properly install libraries on cygwin
...
Teach mklib/minstall more about cygwin so libraries are properly installed
Have mklib install the .dll into the lib/ staging directory as well
Have minstall install the .dll into PREFIX/bin at the same time as
installing the .dll.a link library into PREFIX/lib
mklib uses a '-' rather than a '.' as the separator before the version
number in library names on cygwin. Change the install globs so they match
library names like that.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-09-01 08:48:06 -06:00
Eric Anholt
a3c2bd416a
Don't pass -ffast-math to clang, since it ignores it and complains.
2010-08-30 14:20:05 -07:00
nobled
2a50187a92
Make configure work with clang
...
It was mistaking clang for gcc and deciding its version
was too low.
2010-08-30 13:59:18 -07:00
Jon TURNEY
e637f8b40c
Add talloc to osmesa library dependencies
...
also link osmesa with C++ standard libraries, as it now contains C++ code
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-08-30 13:41:39 -07:00
Jon TURNEY
6356303de6
Add talloc to dependencies for libGL built with xlib driver
...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-08-30 13:41:36 -07:00
Dave Airlie
37f0654fa5
r300g: rename radeong_dri.so to r300_dri.so
...
acked on irc by Corbin + Marek.
2010-08-25 06:10:01 +10:00
Eric Anholt
639cdd3782
mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved.
...
I had used pkg-config from the Makefile because I didn't want to screw
around with the non-autoconf build, but that doesn't work because the
PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at
configure time needs to be respected and may not be present at build
time.
Bug #29585
2010-08-22 17:36:51 -07:00
Ian Romanick
443a7e4e9a
Merge branch 'master' into glsl2
2010-08-13 20:22:46 -07:00
Li Peng
c33c1912dd
configure: fix wrong variable name GLESv1_LIB_DEPS
...
GLESv1_CM_LIB_DEPS is defined in "configs/autoconf.in",
but configure.ac uses GLESv1_LIB_DEPS.
Signed-off-by: Li Peng <peng.li@linux.intel.com>
2010-07-30 08:52:58 -04:00
Eric Anholt
afe125e0a1
Merge remote branch 'origin/master' into glsl2
...
This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.
Conflicts:
src/mesa/Makefile
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
2010-07-26 17:53:27 -07:00
Chia-I Wu
08f4bc07e4
st/egl: Fix build on FreeBSD.
...
There is no libdl on FreeBSD. Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.
This fixes fdo bug #29093 .
2010-07-16 20:19:13 +08:00
Chia-I Wu
39ae965783
egl: Build egl_dri2 only when DRI drivers are built.
...
That is, build egl_dri2 only when --with-driver=dri is given (the
default).
2010-07-16 19:50:16 +08:00
Chia-I Wu
bb217ba76a
egl: Build egl_dri2 only when xcb-dri2 is available.
...
The driver does not build when xcb-dri2 is not available.
2010-07-16 19:41:29 +08:00
Thomas Balling Sørensen
3299997bcc
vdpau changes
2010-07-14 00:36:17 +02:00
Jakob Bornecrantz
4f956889b7
st/xorg: When selecting st via configure make sure to test for xorg-server
2010-07-13 07:49:00 -07:00
Kristian Høgsberg
2168b87b51
egl_dri2: Support _EGL_PLATFORM_DRM
...
This lets the egl_dri2 driver initialize on just a DRM fd.
2010-07-08 20:10:37 -04:00
Chia-I Wu
cf588ab3f1
st/egl: Add support for !GLX_DIRECT_RENDERING.
...
st/egl uses GLX code for DRI2 support. It should honor
GLX_DIRECT_RENDERING.
Also updates configure.ac to define GLX_DIRECT_RENDERING for st/egl.
2010-07-06 15:27:09 +08:00
John Hein
9617254a1e
Use GLUT_CFLAGS when building glut
...
Fix this build error (in MesaGLUT-7.6.1)...
glut_cmap.c:23:66: error: X11/Xmu/StdCmap.h: No such file or directory
...by not preventing the cflags that pkg-config finds for glut dependencies
(including 'xmu') from being used.
Defining GLUT_CFLAGS before running the pkg-config prevents the
cflags found by pkg-config from being used.
This patch lets GLUT_CFLAGS that configure & pkg-config work
so hard to set actually get used.
Also make sure the generated configs/autoconf defines GLUT_CFLAGS
used in (at least) src/glut/glx/Makefile.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-07-01 13:00:02 -07:00
Chia-I Wu
d8e0e11456
st/egl: Reorganize targets.
...
Merge all targets into targets/egl/. The target produces
egl_gallium_<HW>.so for each pipe driver and st_<API>.so for each client
APIs. This enables us to further merge egl_gallium_<HW>.so into
egl_gallium.so later.
2010-06-29 17:16:20 +08:00
Jakob Bornecrantz
a01e0afd9f
Merge branch 'gallium-drm-driver-drescriptor'
...
Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
2010-06-28 21:14:45 +02:00
Eric Anholt
0a1b54df7a
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-24 17:23:21 -07:00
Corbin Simpson
2560978588
configure: Add galahad to default build.
2010-06-22 22:49:13 -07:00
Jakob Bornecrantz
23a915e2cf
gallium: Drop sw drm winsys
...
Last user went away
2010-06-23 03:43:52 +02:00
Jakob Bornecrantz
7dce4f3c27
i915g: Create seperate option for i915g and i965g
2010-06-22 20:04:54 +02:00
Chia-I Wu
da39d5d3b4
egl: s/EGL_DISPLAY/EGL_PLATFORM/.
...
A platform is already used to mean a window system in EGL. No need to
use a different term.
2010-06-17 16:30:26 +08:00
Chia-I Wu
8f3e48ee2c
st/egl: Build sw/fbdev winsys for fbdev backend.
...
Target egl_fbdev_swrast.so needs sw/fbdev/libfbdev.a.
2010-06-17 14:13:30 +08:00
Dan Nicholson
cbf30fce32
osmesa: always build standalone for internal symbols
...
When building OSMesa and xlib GL, the resulting OSMesa would be linked
against libGL instead of the internal mesa libraries. However, when
building with -fvisibility=hidden, some of the internal functions used
in OSMesa could not be resolved through libGL.
Instead, always build OSMesa standalone without linking against libGL.
This has the advantage that OSMesa is always built the same way, but it
means that disk space is wasted when libGL is installed since both
libraries will contain the internal objects.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Tom Fogal <tfogal@alumni.unh.edu>
2010-06-16 09:23:17 -07:00
Eric Anholt
73de09f265
i965: Convert the binding table to streamed indirect state.
...
This slightly reduces reduces cairo-gl firefox-talos-gfx runtime on my
Ironlake:
before:
[ # ] backend test min(s) median(s) stddev. count
[ 0] gl firefox-talos-gfx 38.236 38.383 0.43% 5/6
after:
[ 0] gl firefox-talos-gfx 37.799 38.203 0.39% 6/6
It turns out the cost of caching these objects and looking them up in
the cache again is greater than the cost of just computing the object
again, particularly when the overhead of having a separate BO to pin
is removed.
(Those that are paying close attention will note that this is a
reversal of the path I was moving the driver in a couple of years ago.
The major thing that has changed is that back then all state was
recomputed when we wrapped the streaming state buffer, including
recompiling our precious programs. Now, we're uncaching just the
objects that are cheap to compute, and retaining caching of expensive
objects)
2010-06-11 00:15:56 -07:00
Jakob Bornecrantz
0528106cc7
glew: Drop glew now that we don't need it for the progs
...
configs/beos | 2 +-
configs/darwin | 2 +-
configs/default | 4 +-
configs/freebsd-dri | 2 +-
configs/linux-cell | 2 +-
configs/linux-dri-xcb | 2 +-
configs/linux-indirect | 2 +-
configure.ac | 2 +-
include/GL/glew.h |14435 ------------------------------------------------
include/GL/glxew.h | 1476 -----
include/GL/wglew.h | 1247 -----
src/SConscript | 1 -
src/glew/LICENSE.txt | 73 -
src/glew/Makefile | 54 -
src/glew/SConscript | 69 -
src/glew/glew.c |14320 -----------------------------------------------
src/glew/glewinfo.c | 8441 ----------------------------
src/glew/visualinfo.c | 1173 ----
18 files changed, 8 insertions(+), 41299 deletions(-)
Revert "glew: update to version 1.5.4"
This reverts commit a189b1c53b
.
Revert "glew: Include X11 headers and libraries in SCons build."
This reverts commit efdd33985c
.
Revert "scons: Fix GLEW build on Mac OS X."
This reverts commit 8f81769148
.
Revert "scons: Use static glew library on Unices to avoid binary compatability issues"
This reverts commit de22c940a1
.
Revert "glew: Update to version 1.5.2."
This reverts commit aaf7ecfd81
.
Revert "scons: Build glew on all platforms."
This reverts commit 52eb3e4235
.
Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib."
This reverts commit 8a318edd08
.
Didn't revert scons/gallium.py
Revert "scons: Fix glew build on MSVC."
This reverts commit 14a8c9dac7
.
Revert "scons: Build progs together with everything else."
This reverts commit 7bbf7f94ea
.
Only changed src/glew/SConscript
Revert "mesa: include glew headers in MesaDemos tarballs"
This reverts commit c57d81ddc9
.
Revert "mesa: include GLEW sources in MesaDemos tarball"
This reverts commit b9e2e32daf
.
Revert "glew: correct misspelling of glFramebufferTextureLayer"
This reverts commit 1b05b5b4fe
.
Revert "glew: fix GLEW_LIB_NAME"
This reverts commit c10df26a31
.
Revert "Add dummy install target for glew to fix 'make install'"
This reverts commit c273dfe6a2
.
Revert "autoconf: Add GLEW needed by progs when building GLUT"
This reverts commit 2977cee38e
.
Revert "glew: Build it as a static lib."
This reverts commit fcf9353fea
.
Revert "glew: Initial import."
This reverts commit 57d00016ca
.
2010-06-08 02:07:24 +02:00
Kristian Høgsberg
56c3cce2a1
Remove last bits of progs/ infrastructure
2010-06-07 10:08:48 -04:00
Chia-I Wu
8e1b375a8d
autoconf: Remove unused APIS.
...
It was used by glapi, which has been moved to mapi.
2010-05-31 10:43:00 +08:00
Younes Manton
ea3a01ae4d
vl: Get nouveau building again.
...
Still some DRI2 bits to sort out.
2010-05-29 19:22:14 -04:00
Jakob Bornecrantz
aeee52691c
r600g: Integrate into build
...
Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
2010-05-27 23:24:12 +02:00
Younes Manton
2c29a93e87
vl: Get softpipe building again.
2010-05-08 20:11:29 -04:00
Younes Manton
a8ea1dacc6
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
...
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
src/gallium/drivers/identity/id_objects.c
src/gallium/drivers/identity/id_objects.h
src/gallium/drivers/identity/id_screen.c
src/gallium/drivers/nv40/Makefile
src/gallium/drivers/nv40/nv40_screen.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_texture.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/drivers/softpipe/sp_video_context.h
src/gallium/include/pipe/p_format.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/pipe/p_video_context.h
src/gallium/include/pipe/p_video_state.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/state_trackers/dri/common/dri_context.c
src/gallium/state_trackers/xorg/xvmc/attributes.c
src/gallium/state_trackers/xorg/xvmc/block.c
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/state_trackers/xorg/xvmc/subpicture.c
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/state_trackers/xorg/xvmc/tests/.gitignore
src/gallium/state_trackers/xorg/xvmc/tests/Makefile
src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/g3dvl/vl_winsys.h
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
src/gallium/winsys/sw/Makefile
2010-04-30 20:42:30 -04:00
Eric Anholt
1a8b1277c5
Fix test for MESA_LLVM.
2010-05-21 12:20:40 -07:00
Eric Anholt
68fc4b415e
Remove demos that have moved to git+ssh://git.freedesktop.org/git/mesa/demos.
...
The remaining programs are ones I've had difficulty finding a build
environment for to make the build system or are unit tests that should
probably live next to their code instead. Hopefully people can bring
over the build for remaining pieces they care about.
2010-05-21 12:20:39 -07:00
Chia-I Wu
70ae8bf26f
progs/egl: Fix building on cygwin.
...
Update the Makefiles to use variables such as EGL_LIB_NAME. Define M_PI
if it hasn't been defined yet.
2010-05-19 13:39:40 -06:00
Jakob Bornecrantz
2c3fb4ecce
rbug: Break out of trace
2010-05-12 20:15:23 +01:00
Chia-I Wu
87cc2da16e
mesa/es: Merge back to core mesa.
...
With the omit list gone, there are not too many differences in building
core mesa and ES overlay. Remove the mesa/es and build both of them in
src/mesa/Makefile.
2010-05-12 15:03:42 +08:00
Vinson Lee
48f8a76549
autoconf: Also strip '\r' character in version scrape.
...
Fixes autoconf GCC conftest.c test on Cygwin.
2010-05-11 12:33:30 -07:00
Chia-I Wu
3ecb8c20f8
gallium: Add llvmpipe support to st/egl.
...
Update Makefile rules for st/egl.
2010-05-11 12:42:22 +08:00
Chia-I Wu
63ab2509bf
gallium: Add egl-apis target.
...
The new target installs client API modules to EGL_DRIVER_INSTALL_DIR.
They are used by st/egl.
The client APIs are built from OpenGL and OpenVG state trackers. For
this to work, st/vega is modified to produce a static library,
libvega.a, instead. st/es is also not needed any more. It is removed
and --with-state-trackers=es is replaced by --enable-gles-overlay.
As st/egl now has its own client API modules, this solves the ABI issue
between st/egl and client APIs, as long as the client API modules are
distributed with st/egl. Plus, this allows st/egl to support OpenGL
with non-Gallium libGL.so.
2010-05-08 14:57:21 +08:00
Chia-I Wu
3e1ccb2508
mapi: Merge src/gles/.
...
Remove src/gles and have mapi/{es1api,es2api} build libGLESv1_CM.so and
libGLESv2.so.
2010-05-08 14:55:57 +08:00
Chia-I Wu
874ccd5d83
Define OpenGL ES and OpenVG library names.
...
Define <API>_LIB, <API>_LIB_NAME, <API>_LIB_GLOB, and some other
variables in the configs. Fix a typo in glesv1_cm.pc.in where an
inexistent variable is used.
2010-05-08 14:55:52 +08:00
Chia-I Wu
75143ef055
st/vega: Use vgapi.
...
Rename vgFooBar to vegaFooBar and use vgapi as the dispatcher. This
makes sure there is always a current context when the internal functions
are called. And eglGetProcAddress is finally supported.
2010-05-07 10:41:12 +08:00
Chia-I Wu
296adbd545
glapi: Move to src/mapi/.
...
Move glapi to src/mapi/{glapi,es1api,es2api}.
2010-05-07 10:41:11 +08:00
Chia-I Wu
a6ec153830
mesa: Fix build of ES overlay.
...
ES overlay is built with FEATURE_ES1 or FEATURE_ES2, and is built
without FEATURE_GL. Fix the build by always building OpenGL ES sources,
but test for FEATURE_ES1 or FEATURE_ES2. Also, define symbols that are
missing because FEATURE_GL is not defined.
2010-05-05 11:57:46 +08:00
Kristian Høgsberg
9e4f2da848
Fix gles .pc file generation
2010-05-04 14:13:46 -04:00
Kristian Høgsberg
2df3c361ef
configure.ac: Fix test for whether to build src/gles
2010-05-02 14:52:39 -04:00
Kristian Høgsberg
da76a4d845
mesa: Only compile ES files when ES1 or ES2 are selected
...
This still requieres manual generation of the es1 and es2 glapis and is
disabled by default.
2010-05-02 14:09:52 -04:00
Kristian Høgsberg
0870e4a202
Merge branch 'gles2-2'
...
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
2010-05-02 10:17:07 -04:00
Kristian Høgsberg
9fd5fa0512
Hook in install rules for es1 and es2
2010-05-02 10:14:53 -04:00
Kristian Høgsberg
74399d4af5
Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2
2010-05-02 09:51:13 -04:00
Kristian Høgsberg
9339c1291d
gles: Build libGLESv1_CM.so and libGLESv2.so from glapi files
2010-04-28 14:41:21 -04:00
Kristian Høgsberg
0f68032a7c
configure.ac: Add options to enable GLES1/2 API support
2010-04-28 14:36:28 -04:00
Younes Manton
edca5360ca
vl: Fix up configure.ac/Makefile
2010-04-24 13:52:23 -04:00
Jakob Bornecrantz
fe0fe67aaf
configure.ac: Print some llvm info
2010-04-28 16:06:17 +01:00
Chia-I Wu
fbfecda6ae
progs/egl: Add egl/eglut to PROGRAM_DIRS.
...
Make sure eglut is built before the demos. This should work more
reliably with make -j<N>.
2010-04-27 14:19:24 +08:00
Dave Airlie
22e8ddc748
llvm: fix configure.ac harder
2010-04-25 07:55:15 +10:00
Dave Airlie
81fe19843a
llvmpipe: add initial autoconf support.
...
allows the swrastg_dri.so to be built with llvmpipe, also links llvm
to all dri drivers
use --enable-gallium-llvm to use it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-04-24 18:55:50 +10:00
Jakob Bornecrantz
44bafca1a0
i915g: Add a software only debuging winsys
2010-04-17 21:13:23 +01:00
Chia-I Wu
c727ef0108
progs/egl: Move demos a level deeper.
...
Move the demos to "opengl" subdirectory.
2010-04-01 22:25:48 +08:00
Xavier Chantry
ff0987a15d
svga: Fix typo in configure script
...
Introduced in a82e37b9e9
2010-03-26 13:28:29 +01:00
Jakob Bornecrantz
5b1fc14627
st/dri: Reshuffle files and make it obvious which files are shared
...
In short:
git mv ../drisw/Makefile dri/sw
git mv drisw.[c|h] sw
git mv dri2.[c|h] dri1.[c|h] Makefile drm
git rm ../drisw
ln -s <common files> drm/*
ln -s <common files> sw/*
2010-03-26 00:37:52 +01:00
Jakob Bornecrantz
a82e37b9e9
gallium: Add propper sanity checks in configure.ac
2010-03-25 22:54:56 +01:00
George Sapountzis
7b333298fc
configure:ac add swrastg_dri
2010-03-25 17:01:54 +02:00
George Sapountzis
992e9572bd
swrastg_dri: add state_tracker
2010-03-25 17:01:53 +02:00
Jakob Bornecrantz
c9f98673c5
gallium: Reorg winsys directories
...
Attached output from commit.
delete mode 100644 src/gallium/winsys/drm/SConscript
delete mode 100644 src/gallium/winsys/drm/i965/SConscript
delete mode 100644 src/gallium/winsys/drm/intel/Makefile
delete mode 100644 src/gallium/winsys/drm/intel/SConscript
delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/SConscript
delete mode 100644 src/gallium/winsys/drm/vmware/Makefile
delete mode 100644 src/gallium/winsys/drm/vmware/SConscript
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%)
rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%)
rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%)
rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%)
copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%)
rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/null/Makefile (78%)
rename src/gallium/winsys/{ => sw}/null/SConscript (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%)
rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%)
rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
43218a45a4
gallium: Move xorg drivers to targets
...
Attached output from git commit:
rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/Makefile (95%)
rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/intel_xorg.c (98%)
rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/Makefile (78%)
rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/intel_xorg.c (98%)
rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/Makefile (96%)
rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/nouveau_xorg.c (98%)
rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/Makefile (73%)
rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/radeon_xorg.c (98%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/Makefile (97%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/SConscript (100%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_driver.h (100%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_hook.h (100%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_ioctl.c (99%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_screen.c (100%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_video.c (99%)
rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_xorg.c (100%)
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
f5ba2cdeb9
gallium: Move egl drivers to targets
...
Atteched output from git commit:
rename src/gallium/{winsys/drm => targets}/Makefile.egl (100%)
rename src/gallium/{winsys/drm/intel/egl => targets/egl-i915}/Makefile (86%)
rename src/gallium/{winsys/drm/i965/egl => targets/egl-i915}/dummy.c (100%)
rename src/gallium/{winsys/drm/i965/egl => targets/egl-i965}/Makefile (86%)
rename src/gallium/{winsys/drm/intel/egl => targets/egl-i965}/dummy.c (100%)
rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/Makefile (88%)
rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/dummy.c (100%)
rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/Makefile (87%)
rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/dummy.c (100%)
create mode 100644 src/gallium/targets/egl-swrast/Makefile
create mode 100644 src/gallium/targets/egl-swrast/swrast_glue.c
rename src/gallium/{winsys/drm/vmware/egl => targets/egl-vmwgfx}/Makefile (86%)
rename src/gallium/{winsys/drm/swrast/egl => targets/egl-vmwgfx}/dummy.c (100%)
delete mode 100644 src/gallium/winsys/drm/swrast/Makefile
delete mode 100644 src/gallium/winsys/drm/swrast/core/Makefile
delete mode 100644 src/gallium/winsys/drm/swrast/core/swrast_drm_api.c
delete mode 100644 src/gallium/winsys/drm/swrast/egl/Makefile
delete mode 100644 src/gallium/winsys/drm/vmware/egl/dummy.c
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
be38b32531
gallium: Move dri drivers to targets
...
Attached output from git commit:
rename src/gallium/{winsys/drm/Makefile.template => targets/Makefile.dri} (100%)
rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/Makefile (75%)
rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/SConscript (100%)
rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/Makefile (76%)
rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/SConscript (100%)
rename src/gallium/{winsys/drm/nouveau/dri => targets/dri-nouveau}/Makefile (86%)
rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/Makefile (85%)
rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/SConscript (100%)
rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/Makefile (85%)
rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/SConscript (100%)
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
41d2ebf202
gallium: Remove GALLIUM_WINSYS_DRM_DIRS
2010-03-24 17:02:17 +01:00
Dan Nicholson
e725ef171b
Change libX11 variables to not conflict with AC_PATH_XTRA
...
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-23 13:26:50 -07:00
Luca Barbieri
f9d09a2e78
nv30, nv40: move last files to nvfx/ and rm -rf nv30 nv40
...
This is the last nvfx unification patch.
nv[34]0_fragtex.c are moved to the common directory
nv[34]0_shader.h are renamed to nv[34]0_vertprog.h and moved to
the common directory
The separate nv30 and nv40 directories are removed from the build
system
2010-03-15 00:03:04 -04:00
Luca Barbieri
6321a18331
nvfx: add nvfx directory to build system
...
Will be used to hold source files unified between nv30 and nv40.
Eventually all nv30 and nv40 code will be moved there and the
nv30 and nv40 directories will be removed.
2010-03-15 00:03:01 -04:00
Jeff Smith
8d86d395dc
Use X_LIBS from pkg-config, instead of libdir, for locating libX11
...
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-13 11:42:24 -08:00
Michel Dänzer
b13e305ee1
Merge branch '7.8'
2010-03-12 19:00:47 +01:00
Keith Whitwell
51bff09f72
mesa: fix linux-dri and autogen builds since sw-api-2 merge
2010-03-12 09:05:59 +00:00
Younes Manton
a8238bb08a
Merge remote branch 'origin/master' into pipe-video
...
Conflicts:
configure.ac
src/gallium/auxiliary/vl/Makefile
src/gallium/auxiliary/vl/SConscript
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
src/gallium/drivers/nouveau/nouveau_winsys.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_video_state.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/g3dvl/nouveau/Makefile
2010-03-12 01:37:49 -05:00
Jakob Bornecrantz
683a099954
st/xorg: Fixup configure
...
Make sure we always test for XEXT version.
Make sure that the user has a recent version of libkms and libdrm installed.
Note that the st/xorg code requires so new versions to work but these are
needed to make a proper vmwgfx_drv.so driver which is the only real user.
Cherry picked from 46cf606cd3
Conflicts:
configure.ac
2010-03-11 19:30:16 +00:00
George Sapountzis
9009a854d1
config: drop WINDOW_SYSTEM var
2010-03-06 06:44:36 +02:00
Younes Manton
40cd082afa
vl: Add switches to autoconf.
...
Pass 'xorg/xvmc' to --with-state-trackers to get the XvMC state tracker.
Pass --enable-gallium-g3dvl to enable the winsys.
2010-03-05 23:11:05 -05:00
Ian Romanick
9aa3aa7138
Add version check for GCC
...
Mesa now requires GCC 3.3.0 or later. See the following thread from
the mesa3d-dev mailing list for more details:
http://marc.info/?t=126748568900005&r=1&w=2
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-03 16:26:32 -08:00
Eric Anholt
179d2c0e0b
intel: Use drm_intel_bo_alloc_tiled for region allocs.
...
This moves the logic for how to align pitches, heights, and sizes of
objects to one central location. Fixes rendering with texture tiling
on i915. Note that current libdrm is required for the change for
I915_TILING_NONE pitch alignment.
2010-03-03 11:33:37 -08:00
Kristian Høgsberg
79aeafd3ca
Drop fb, ffb and gamma dri drivers
2010-02-25 17:40:11 -05:00
Kristian Høgsberg
4387580e50
Remove directfb support
2010-02-25 17:40:09 -05:00
Brian Paul
979889038e
configure: PTHREADS should be defined on cygwin, as well
...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c1a4f249f1
)
2010-02-18 12:46:12 -07:00
Kristian Høgsberg
aa0cd707af
configure.ac: Lower require dri2proto version to 2.1
...
Additions after 2.1 are implemented in a conditional way and will be
supported if available.
2010-02-16 10:38:49 -05:00
Kristian Høgsberg
1ebc568154
configure.ac: Enable egl demos when --enable-egl is passed
2010-02-09 15:55:25 -05:00
Kristian Høgsberg
6e8897ff9f
Retire miniglx and move the actual glx code up to src/glx
2010-02-09 09:58:36 -05:00
Kristian Høgsberg
077bc2fda2
egl_dri2: Use pkg-config cflags and libs from configure output
...
Running pkg-config in Makefiles is bad form, since it doesn't respect the
PKG_CONFIG_PATH value set at ./configure time.
2010-02-05 13:55:45 -05:00
Keith Whitwell
c036d13d7d
Merge commit 'fj/mesa-next'
2010-02-05 09:50:21 +00:00
Chia-I Wu
2eb7a2fccd
configure.ac: Check for xcb-dri2 to enable EGL dri2 driver.
...
Check that xcb-dri2 is available before including EGL dri2 driver into
EGL_DRIVERS_DIRS.
2010-02-05 11:43:54 +08:00
Francisco Jerez
5b6b67eb3f
Nuke the nv0x-nv2x gallium pipe drivers.
2010-02-04 22:15:22 +01:00
Kristian Høgsberg
42fa009e64
egl: Add driver for EGL on X with DRI2
2010-02-04 15:03:45 -05:00
Chia-I Wu
146931769c
glx: Build GLX normally.
...
GLX was built specially and before Mesa core because libglapi.a could
not be built with IN_DRI_DRIVER defined. This is no longer the case
since 6e99e6ddbf
.
It works fine in my (limited) testing with both direct and indirect
rendering. I also compare the outputs after preprocessing (gcc -E) with
or without this commit, and they are identical.
2010-01-26 11:03:54 +08:00
Chia-I Wu
28c3e57c83
egl: Install drivers to ${libdir}/egl.
...
Install EGL drivers to EGL_DRIVER_INSTALL_DIR, which is default to
${libdir}/egl.
2010-01-23 20:30:11 +08:00
Chia-I Wu
3c967a9207
st/egl_g3d: Rename to st/egl.
...
Simply the name to egl.
2010-01-22 16:45:28 +08:00
Chia-I Wu
a1306f4ef6
winsys/drm: Add swrast.
...
The swrast winsys always returns NULL when drm_api_create is called.
2010-01-22 16:44:09 +08:00
Chia-I Wu
52d7b2cede
st/egl: Remove the egl state tracker.
...
The egl_g3d state tracker has support for KMS, and the support is based
on the egl state tracker. As egl_g3d provides more features, it should
be better to keep only egl_g3d to unify the efforts.
2010-01-22 15:37:56 +08:00
Chia-I Wu
2a928899e3
egl: Remove USING_EGL and the related drivers.
...
They do not build for a long while and there seems to be no active
users. It might be better for them to live in the git histroy.
2010-01-22 15:16:31 +08:00
Alan Coopersmith
f8107a45ce
Fix typo in configure message for gcc -fvisibility=hidden
...
Need to use $CC for a shell variable, not $(CC) for a make variable
which the shell interprets as running the command "CC".
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-01-21 16:43:59 -08:00
Chia-I Wu
5e8240320a
Merge remote branch 'origin/opengl-es-v2'
2010-01-20 10:02:15 +08:00
Alan Coopersmith
adda7f3215
Check if gcc supports -fvisibility=hidden before adding to CFLAGS
...
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-01-19 10:15:55 -08:00
Jakob Bornecrantz
877cadb655
r300g: Build driver by default
...
Do the auto trick that is used for both i915, i965 and svga.
2010-01-14 22:51:25 +00:00
Jesse Barnes
ed59b13da8
GLX: use glproto CFLAGS etc. when building
...
Roll the glproto check into the dri2proto and libdrm check so we get the
proper CFLAGS and LDFLAGS for the package.
2010-01-13 15:48:14 -05:00
Chia-I Wu
99a37ed195
configure.ac: Fix es state tracker build.
...
mesa/es should be built before the es state trackers. This is done by
separating those that need to be built early from SRC_DIRS to CORE_DIRS.
The new variable is not exported, and will be prepended to SRC_DIRS.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:25:09 +08:00
Chia-I Wu
562c127693
Merge branch 'master' into opengl-es-v2
...
Conflicts:
src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
Chia-I Wu
077d6dd750
winsys/drm: Use egl_g3d to build EGL drivers.
...
The new EGL drivers use egl_g3d and respect EGL_DISPLAYS. They are
named after the display supported and the DRM name.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:09:00 +08:00
Chia-I Wu
a68b51deb2
st/egl_g3d: Add support for KMS native display.
...
The KMS native display implements the modeset interface using DRM
modesetting.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:09:00 +08:00
Chia-I Wu
49381d63e6
st/egl_g3d: New EGL state tracker that uses Gallium.
...
This new (intermediate) EGL state tracker is the base work for EGL
drivers that uses Gallium. It makes it easier to support new window
systems.
Currently, there is support only for X11. This driver supports multiple
APIs (OpenVG, OpenGL, ...) and supports hardware acceleration through
winsys/drm.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:08:57 +08:00
Jesse Barnes
f2f83d9a78
GLX: check glproto version
...
This was a silent dependency before, but now we really need 1.4.11 for
INTEL_swap_event support, so check for it.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-11 17:30:41 -05:00
Jesse Barnes
c6ef705e41
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
...
Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
2010-01-11 15:23:29 -05:00