Age | Commit message (Collapse) | Author |
|
acked on irc by Corbin + Marek.
|
|
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
|
|
|
|
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>
|
|
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
|
|
There is no libdl on FreeBSD. Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.
This fixes fdo bug #29093.
|
|
That is, build egl_dri2 only when --with-driver=dri is given (the
default).
|
|
The driver does not build when xcb-dri2 is not available.
|
|
|
|
This lets the egl_dri2 driver initialize on just a DRM fd.
|
|
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.
|
|
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>
|
|
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.
|
|
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
|
|
|
|
|
|
Last user went away
|
|
|
|
A platform is already used to mean a window system in EGL. No need to
use a different term.
|
|
Target egl_fbdev_swrast.so needs sw/fbdev/libfbdev.a.
|
|
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>
|
|
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)
|
|
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 a189b1c53b6a3b6c055cc86145c8ef48c580e9d0.
Revert "glew: Include X11 headers and libraries in SCons build."
This reverts commit efdd33985cb38429aeae845a556db2322957e71a.
Revert "scons: Fix GLEW build on Mac OS X."
This reverts commit 8f81769148eab0042ffb7192a702350275648715.
Revert "scons: Use static glew library on Unices to avoid binary compatability issues"
This reverts commit de22c940a1df66d13825dd15c015eafabb61a11d.
Revert "glew: Update to version 1.5.2."
This reverts commit aaf7ecfd816f82fef314f4f772cc53bc0ced553e.
Revert "scons: Build glew on all platforms."
This reverts commit 52eb3e4235cc661ab9626a704c555a5f096c628a.
Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib."
This reverts commit 8a318edd0838ee3343be0425019d93541b621567.
Didn't revert scons/gallium.py
Revert "scons: Fix glew build on MSVC."
This reverts commit 14a8c9dac7ea43ad8a45052e17f7127451344e5a.
Revert "scons: Build progs together with everything else."
This reverts commit 7bbf7f94ea786e41ff1364cedaf7dd5c0bbf605a.
Only changed src/glew/SConscript
Revert "mesa: include glew headers in MesaDemos tarballs"
This reverts commit c57d81ddc9ba3052ff7f6b72091accab2c2db0ae.
Revert "mesa: include GLEW sources in MesaDemos tarball"
This reverts commit b9e2e32daf5505896a662dc8df60104c0f51b4b9.
Revert "glew: correct misspelling of glFramebufferTextureLayer"
This reverts commit 1b05b5b4fecd9ac8ef34abdda6c085868016ad84.
Revert "glew: fix GLEW_LIB_NAME"
This reverts commit c10df26a31b6af5a720fbfd06411d580cd38a2c8.
Revert "Add dummy install target for glew to fix 'make install'"
This reverts commit c273dfe6a28d4bb64ce167685b4053d22db5a727.
Revert "autoconf: Add GLEW needed by progs when building GLUT"
This reverts commit 2977cee38e21b8e5ebba1635b101185d64ee44a9.
Revert "glew: Build it as a static lib."
This reverts commit fcf9353fea8343a1a86c8c6e0144c8429440c648.
Revert "glew: Initial import."
This reverts commit 57d00016cab9afa3e7853d9830044a8ece9541c4.
|
|
|
|
It was used by glapi, which has been moved to mapi.
|
|
Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
|
|
|
|
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.
|
|
Update the Makefiles to use variables such as EGL_LIB_NAME. Define M_PI
if it hasn't been defined yet.
|
|
|
|
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.
|
|
Fixes autoconf GCC conftest.c test on Cygwin.
|
|
Update Makefile rules for st/egl.
|
|
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.
|
|
Remove src/gles and have mapi/{es1api,es2api} build libGLESv1_CM.so and
libGLESv2.so.
|
|
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.
|
|
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.
|
|
Move glapi to src/mapi/{glapi,es1api,es2api}.
|
|
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.
|
|
|
|
|
|
This still requieres manual generation of the es1 and es2 glapis and is
disabled by default.
|
|
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
|
|
|
|
|
|
|
|
|
|
|
|
Make sure eglut is built before the demos. This should work more
reliably with make -j<N>.
|
|
|