| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Use --cppflags instead of --cflags so that we get the -I and -D flags
we want, but not compiler options like -O3.
A similar change should probably be made for autoconf.
|
|
|
|
|
| |
-D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for
LLVM build.
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
| |
This patch undoes commit 9b7480cd95c2d1259e23bfb5549cefaa94ebaca1.
A follow-on patch will provide the proper fix.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
This fixes the following error when trying to run glxinfo or glxgears
with swrast.
undefined symbol: __cxa_pure_virtual
|
|
|
|
| |
Fixes build after glsl2 branch merge, which added talloc dependency.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/ |
|
|
|
|
|
|
|
| |
There is no libdl on FreeBSD. Based on patch from Thinker
<thinker@branda.to>, which is against 7.8.
This fixes fdo bug #29093.
|
|
|
|
| |
This lets the egl_dri2 driver initialize on just a DRM fd.
|
|
|
|
|
| |
We check for libX11 and libXt, so we might as well use the CFLAGS
pkg-config tells us about.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
A platform is already used to mean a window system in EGL. No need to
use a different term.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
|
| | | |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Xlib demos were fixed to use $(X11_LIBS) so that configure could
detect the proper directory to link the library from, but this broke
the non-autoconf builds. Give X11_LIBS a default value to fallback on.
(cherry picked from commit e40fce13e152ecf929c899ed38a8e5f7d198c738)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
(cherry picked from commit e725ef171b5a4d5425461f237d9ccab223806913)
|
| | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit 8d86d395dcf6a5f192b6987485bb7aef49f1fefc)
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc.
This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1.
This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787.
This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890.
This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b.
This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b.
This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae.
This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
| | |
| | |
| | |
| | |
| | | |
Make sure eglut is built before the demos. This should work more
reliably with make -j<N>.
|