summaryrefslogtreecommitdiff
path: root/src/mapi/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2018-01-19autotools: include meson build files in tarballDylan Baker1-1/+6
This adds the meson.build, meson_options.txt, and a few scripts that are used exclusively by the meson build. v2: - Remove accidentally included changes needed to test make dist with LLVM > 3.9 Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Acked-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-10-13mapi/shared-glapi/test: rework glapitable.h handlingEmil Velikov1-2/+3
Currently all the build systems but Meson generate the header in src/mapi/glapi. Meson cannot do that since: - it does not allow user control over the location of output files - moving the generation rule(s) causes explosion due to the unusual structure of glapi and friends - copying the file into the correct location is a non-trivial task To workaround the above deficiency in the least invasive way, let's adjust the #include directive and add a few -I flags to the autotools build. Note: both builddir and srcdir, should be used. Otherwise building from a release tarball fails badly. Cc: Dylan Baker <dylanx.c.baker@intel.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Tested-by: Mark Janes <mark.a.janes@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
2017-10-13Revert "make: Fix test to be meson compatible"Emil Velikov1-2/+0
This reverts commit fc48ad24272799b154de37f6a944eb391bdbbb82. There commit reference the previous commit as it justification of changing behaviour. Although unlike the said commit, there's nothing obviously wrong there. I'll take a look close why Meson fails to pick the file, but in the interim reverting this commit fixes the normal distcheck target.
2017-10-09make: Fix test to be meson compatibleDylan Baker1-0/+2
This has the same problem as the previous commit, generated headers and hardcoded paths. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2017-07-14configure: only install khrplatform.h if neededEric Engestrom1-0/+2
khrplatform.h is only used by EGL and GLES; let's only install it when one of those is enabled. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-06-14Fix khrplatform.h not installed if EGL is disabled.Eric Le Bihan1-0/+3
KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is only installed if Mesa3d is compiled with EGL support. This patch installs this header file unconditionally. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77240 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-05-04mapi_abi.py: remove no longer used --mode optionEmil Velikov1-3/+3
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2017-05-04mapi/es*api: remove unneeded HAVE_SHARED_GLAPI guardEmil Velikov1-4/+0
Always true, since GLES* requires shared glapi. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-01-27mapi: automake: include builddir prior to srcdirEmil Velikov1-2/+2
Analogous to previous commit. Cc: "12.0 13.0" <mesa-dev@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-10-24mapi: automake: set VISIBILITY_CFLAGS for shared glapiJonathan Gray1-0/+3
shared glapi was previously built without setting CFLAGS for AM_CFLAGS and VISIBILITY_CFLAGS. This resulted in symbols being exported that shouldn't be. The x86 and sparc assembly versions of the dispatch table partially mitigated this by using .hidden. Otherwise shared_dispatch_stub_* were being exported. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Cc: "11.2 12.0 13.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
2016-10-12mapi: fix out-of-tree build dependenciesNicolai Hähnle1-2/+2
We shouldn't be using wildcard here in the first place, but changing that is some effort. As it stands, make -p confirms that glapi_gen_mapi_deps only contains mapi_abi.py when building outside the Mesa tree. As a result, only some of the tables were updated when XML files change, but not the tables for shared glapi. This change ensures that we pick up the XML files and scripts from the source tree as dependencies also for shared glapi. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2016-09-15direct-to-native-GL for GLX clients on Cygwin ("Windows-DRI")Jon Turney1-0/+3
Structurally, this is very similar to the existing Apple-DRI code, except I have chosen to implement this using the __GLXDRIdisplay, etc. vtables (as suggested originally in [1]), rather than a maze of ifdefs. This also means that LIBGL_ALWAYS_SOFTWARE and LIBGL_ALWAYS_INDIRECT work as expected. [1] https://lists.freedesktop.org/archives/mesa-dev/2010-May/000756.html This adds: * the Windows-DRI extension protocol headers and the windowsdriproto.pc file, for use in building the Windows-DRI extension for the X server * a Windows-DRI extension helper client library * a Windows-specific DRI implementation for GLX clients The server is queried for Windows-DRI extension support on the screen before using it (to detect the case where WGL is disabled or can't be activated). The server is queried for fbconfigID to pixelformatindex mapping, which is used to augment glx_config. The server is queried for a native handle for the drawable (which is of a different type for windows, pixmaps and pbuffers), which is used to augment __GLXDRIdrawable. Various GLX extensions are enabled depending on if the equivalent WGL extension is available.
2016-09-06mapi: add gl32.h to the list of GLES3 headers for installationIlia Mirkin1-0/+1
This was missed when I added the updated (and new) Khronos headers. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Mark Janes <mark.a.janes@intel.com> Tested-by: Mark Janes <mark.a.janes@intel.com>
2016-01-21glapi: Build glapi_gentable.c only on DarwinAndreas Boll1-1/+5
Removes the public symbol _glapi_create_table_from_handle from libGL.so.1.2.0 on all platforms except Darwin. Since the symbol is not used on other platforms it makes sense to build glapi_gentable.c only on Darwin. As a side effect it accelerates the build a bit and reduces the size of libGL.so.1.2.0 as follows: size lib/libGL.so.1.2.0 on my system shows text data bss dec hex filename 469211 21848 2720 493779 788d3 lib/libGL.so.1.2.0 before 420988 11240 2720 434948 6a304 lib/libGL.so.1.2.0 after A little bit of history: _glapi_create_table_from_handle was introduced in commit 85937f4c0d4a78d3a11e3c1fa6148640f2a9ad7b Author: Jeremy Huddleston <jeremyhu@apple.com> Date: Thu Jun 9 16:59:49 2011 -0700 glapi: Add API that can create a _glapi_table from a dlfcn handle Example usage: void *handle = dlopen(opengl_library_path, RTLD_LOCAL); struct _glapi_table *disp = _glapi_create_table_from_handle(handle, "gl"); Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> and the only user in mesa was added in commit f35913b96e743c5014e99220b1a1c5532a894d69 Author: Jeremy Huddleston <jeremyhu@apple.com> Date: Thu Jun 9 17:29:51 2011 -0700 apple: Use _glapi_create_table_from_handle to initialize our dispatch table Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> gl_gentable.py was also used for XQuartz in xserver 1.11 - 1.14. v2: Fix typos in commit message Add missing XORG_GLAPI_OUTPUTS += \ into src/mapi/glapi/gen/Makefile.am Add glapi_gentable.c to EXTRA_DIST for inclusion in the release tarball v3: Fix commit message: s/gl_gentable.c/glapi_gentable.c/ Reported-by: Arlie Davis <arlied@google.com> Cc: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2016-01-18mapi: include gl.xml in the tarballEmil Velikov1-0/+1
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2015-09-09mapi: automake: rework the *api/glapi_mapi_tmp.h rulesEmil Velikov1-11/+12
Same logic as previous commit applies. v2: Merge with "inline glapi_gen_mapi define" (Matt) Cc: 11.0 <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2015-06-26mesa: Enable subdir-objects globally.Matt Turner1-2/+0
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-05mapi: fix *glapi dependency trackingEmil Velikov1-2/+2
I.e. add {shared-,}glapi/glapi_mapi_tmp.h to the SOURCES list. Otherwise there will be no knowledge that the file is required by others for the build. Thus autotools won't pick it up for the distribution tarball. v2: Don't forget about the static glapi. Spotted by Matt. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2015-03-04mapi: remove unneeded ARRAY_SIZE #defineBrian Paul1-0/+1
include util/macros.h instead. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2015-03-04st/vega: Remove.Jose Fonseca1-6/+0
OpenVG API seems to have dwindled away. The code would still be interesting if we wanted to implement NV_path_rendering but given the trend of the next gen graphics APIs, it seems unlikely that this becomes ARB or core. v2: Remove a few "openvg" references left, per Emil Velikov. Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> v3: Update release notes.
2015-03-03configure: Leverage gcc warn options to enable safe use of C99 features ↵Jose Fonseca1-1/+3
where possible. The main objective of this change is to enable Linux developers to use more of C99 throughout Mesa, with confidence that the portions that need to be built with MSVC -- and only those portions --, stay portable. This is achieved by using the appropriate -Werror= options only on the places they need to be used. Unfortunately we still need MSVC 2008 on a few portions of the code (namely llvmpipe and its dependencies). I hope to eventually eliminate this so that we can use C99 everywhere, but there are technical/logistic challenges (specifically, newer Windows SDKs no longer bundle MSVC, instead require a full installation of Visual Studio, and that has hindered adoption of newer MSVC versions on our build processes.) Thankfully we have more directy control over our OpenGL driver, which is why we're now able to migrate to MSVC 2013 for most of the tree. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2015-02-27Revert "configure: Leverage gcc warn options to enable safe use of C99 ↵Kenneth Graunke1-3/+1
features where possible." This reverts commit 79daa510c7a871a33797308a2ccb4b83a067ffbe. I apparently hadn't done a clean build when testing this; it broke the build for Tom, Ben, and myself. We like the idea; let's try a v2.
2015-02-27configure: Leverage gcc warn options to enable safe use of C99 features ↵Jose Fonseca1-1/+3
where possible. The main objective of this change is to enable Linux developers to use more of C99 throughout Mesa, with confidence that the portions that need to be built with MSVC -- and only those portions --, stay portable. This is achieved by using the appropriate -Werror= options only on the places they need to be used. Unfortunately we still need MSVC 2008 on a few portions of the code (namely llvmpipe and its dependencies). I hope to eventually eliminate this so that we can use C99 everywhere, but there are technical/logistic challenges (specifically, newer Windows SDKs no longer bundle MSVC, instead require a full installation of Visual Studio, and that has hindered adoption of newer MSVC versions on our build processes.) Thankfully we have more directy control over our OpenGL driver, which is why we're now able to migrate to MSVC 2013 for most of the tree. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2015-01-23mapi: Build with subdir-objects.Matt Turner1-11/+27
2015-01-23mapi: Remove vgapi from SUBDIRS.Matt Turner1-3/+5
OpenVG is disabled with via autotools.
2014-12-12mapi: Move rules for generating glapi_mapi_tmp.h out of the conditional.Matt Turner1-5/+5
Allows distcheck to succeed, regardless of how Mesa has been configured.
2014-12-12mapi: Add ABI-check tests to distribution.Matt Turner1-0/+2
2014-12-12mesa: Add scons files to distribution.Matt Turner1-1/+4
2014-12-12mapi: Add mapi_abi.py to EXTRA_DISTMatt Turner1-0/+2
2014-12-12glapi: Make mapi/glapi/gen before mapi to avoid distcheck problem.Matt Turner1-1/+1
2014-08-18mapi: Inline shared-glapi/tests/Makefile.Matt Turner1-2/+11
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2014-08-18mapi: Inline glapi/tests/Makefile.Matt Turner1-2/+13
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2014-08-18mapi: Inline glapi/Makefile.Matt Turner1-1/+35
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2014-08-18mapi: Inline es2api/Makefile.Matt Turner1-1/+41
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2014-08-18mapi: Inline es1api/Makefile.Matt Turner1-1/+39
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2014-08-18mapi: Inline shared-glapi/Makefile.Matt Turner1-3/+43
2013-04-15build: Get rid of CORE_DIRSMatt Turner1-0/+42
A step toward working make dist/distcheck. Tested-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>