summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #257 from batesj/allow_libopengl1.5.9Emmanuele Bassi2021-07-121-3/+13
|\ | | | | Allow libopengl.so to be used when GLX_LIB is missing
| * Allow libopengl.so to be used when GLX_LIB is missingJohn Bates2021-07-021-3/+13
|/ | | | | | | | | | | | | | | This maintains compatibility with previous behavior of always using GLX_LIB if it is found. The only change is when there is no GLX_LIB. Previous behavior when no GLX_LIB: - abort. New behavior when no GLX_LIB: - Try to load libOpenGL.so as gl_handle (glx_handle remains NULL). - Else, abort. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
* Post-release version bump to 1.5.9Emmanuele Bassi2021-05-211-1/+1
|
* Merge pull request #254 from anholt/issue-2521.5.8Emmanuele Bassi2021-05-211-7/+3
|\ | | | | Revert OpenGL/GLX loading changes
| * Revert "If glvnd library found, do not use libGL.so in epoxy_load_gl"Emmanuele Bassi2021-05-211-6/+3
| | | | | | | | | | | | | | | | | | Commit dbfa4b20 has introduced a string of regressions in the X server and KWin. This reverts commit dbfa4b209c0712b67dfeb8366c2ebe8503063b52. See: #252
| * Revert "Do not overwrite glx_handle in epoxy_load_gl if GLX library is ↵Emmanuele Bassi2021-05-211-2/+1
|/ | | | | | loaded already" This reverts commit 4994c48172e94ca81c000597e0abc0ea0e682b3c.
* Post-release version bump to 1.5.8Emmanuele Bassi2021-04-301-1/+1
|
* Merge pull request #250 from anholt/ebassi/issues-2491.5.7Emmanuele Bassi2021-04-301-1/+0
|\ | | | | Remove redeclaration of khronos_uintptr_t
| * Remove redeclaration of khronos_uintptr_tebassi/issues-249Emmanuele Bassi2021-04-301-1/+0
|/ | | | | | | The type is being redeclared because I didn't see the original declaration when I wrote 144cbc9325250081f2eb584ca5deb13aaf1c2433. Fixes: #249
* Post-release version bump to 1.5.7Emmanuele Bassi2021-04-301-1/+1
|
* Merge pull request #247 from anholt/win64-khr-types1.5.6Emmanuele Bassi2021-04-191-3/+11
|\ | | | | Support Win64 pointer-sized types
| * Support Win64 pointer-sized typeswin64-khr-typesEmmanuele Bassi2021-03-211-3/+11
| | | | | | | | | | | | | | | | Since we're generating stub types from khrplatform.h because we can't include it reliably, we'll have to deal with some of the fallout of the Win64 types. Fixes: #246
* | Merge pull request #243 from amezin/masterEmmanuele Bassi2021-03-311-0/+10
|\ \ | | | | | | gen_dispatch.py: close output files
| * | gen_dispatch.py: close output filesAleksandr2021-03-061-0/+10
|/ / | | | | | | Fixes https://github.com/anholt/libepoxy/issues/242
* | Merge pull request #238 from anholt/pull-229-altEmmanuele Bassi2021-01-201-3/+7
|\ \ | | | | | | Fix some bugs in loading OpenGL/GLX/EGL libraries
| * | Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded alreadypull-229-altYaroslav Isakov2021-01-201-1/+2
| | | | | | | | | | | | | | | | | | Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| * | If glvnd library found, do not use libGL.so in epoxy_load_glYaroslav Isakov2021-01-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without additional check, even if libOpenGL was loaded, libGL.so will be loaded as well, and used both in gl_handle and glx_handle, so libglvnd libraries will not be used. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* | | Merge pull request #231 from xclaesse/meson-varsEmmanuele Bassi2021-01-202-5/+10
|\ \ \ | |/ / |/| | meson: Set same variables in declare_dependency() as in pkgconfig
| * | meson: Set same variables in declare_dependency() as in pkgconfigXavier Claessens2021-01-202-5/+10
|/ / | | | | | | | | | | | | | | | | GTK currently fails to detect if epoxy has been built with EGL on Windows when epoxy is a subproject. To fix that it needs to get that information from the dependency variables. This requires Meson >=0.54.0 for setting variables in declare_dependency().
* | Merge pull request #236 from anholt/ebassi/ci-splitEmmanuele Bassi2020-12-233-15/+34
|\ \ | | | | | | ci: Split Linux and macOS pipelines
| * | Add a badge for the project licenseEmmanuele Bassi2020-12-231-0/+1
| | |
| * | Update the CI status badgesEmmanuele Bassi2020-12-231-2/+4
| | | | | | | | | | | | Use the badges from GitHub Actions.
| * | ci: Split Linux and macOS pipelinesEmmanuele Bassi2020-12-232-13/+29
|/ / | | | | | | Don't use a single pipeline for everything.
* | Merge pull request #235 from anholt/github-ciEmmanuele Bassi2020-12-239-165/+52
|\ \ | | | | | | Move CI to GitHub
| * | ci: Drop tests from MSYS2 pipelinegithub-ciEmmanuele Bassi2020-12-231-1/+0
| | | | | | | | | | | | | | | The WGL tests are failing, likely because of some set up issue; for the time being, we care more about building Epoxy, rather than testing it.
| * | ci: Remove AppVeyor pipelineEmmanuele Bassi2020-12-231-67/+0
| | | | | | | | | | | | We have MSYS2 and MSVC pipelines on GitHub Actions.
| * | ci: Remove TravisEmmanuele Bassi2020-12-235-155/+0
| | | | | | | | | | | | The GitHub Actions pipeline replaces Travis in any way it matters.
| * | ci: Use scripts for GitHub ActionsEmmanuele Bassi2020-12-233-2/+61
| | | | | | | | | | | | Do not share them with the Travis pipelines.
| * | ci: Add MSVC workflow on GitHub ActionsEmmanuele Bassi2020-12-231-0/+23
| | |
| * | ci: Add MSYS2 workflow on GitHub ActionsEmmanuele Bassi2020-12-231-0/+28
|/ /
* | Post-release version bump to 1.5.6Emmanuele Bassi2020-12-221-1/+1
|/
* Merge pull request #228 from eyelash/github-ci1.5.5Emmanuele Bassi2020-07-221-0/+48
|\ | | | | GitHub CI
| * GitHub CIElias Aebi2020-07-211-0/+48
| |
* | Merge pull request #225 from anholt/darwin_versionsEmmanuele Bassi2020-07-222-4/+3
|\ \ | |/ |/| Use the darwin_versions argument
| * Use Meson's darwin_versions argumentdarwin_versionsEmmanuele Bassi2020-07-211-3/+2
| | | | | | | | | | Instead of tweaking the linker flags ourselves. This allows Meson to do the right thing, and pass the arguments only where needed.
| * Require Meson >= 0.48Emmanuele Bassi2020-07-211-1/+1
|/
* Merge pull request #223 from anholt/glslesEmmanuele Bassi2020-04-212-10/+7
|\ | | | | Fix return value of shading language for GLES2.
| * Fix return value of shading language for GLES2.glslesEric Anholt2020-04-202-10/+7
|/ | | | | | | Throughout the mesa project we've been using 100 for GLES2's shading language. It was pretty clearly the intent here, but the clever inline detection of "am I parsing a GLSL version or a GL version string" forgot about GLSL 1.0.x, and thus returned 10.
* Merge pull request #220 from crziter/masterEmmanuele Bassi2020-02-251-1/+1
|\ | | | | Add call convention to mock function
| * Add call convention to mock functioncrziter2020-02-251-1/+1
|/
* Merge pull request #215 from anholt/issue-214Emmanuele Bassi2020-01-141-3/+6
|\ | | | | Use EGL_NO_X11 to disable X11 headers
| * Use EGL_NO_X11 to disable X11 headersEmmanuele Bassi2020-01-141-3/+6
|/ | | | | | | MESA_EGL_NO_X11_HEADERS has been deprecated, and libglvnd only supports EGL_NO_X11. Fixes: #214
* Merge pull request #216 from anholt/gen-find-programEmmanuele Bassi2020-01-142-1/+2
|\ | | | | build: Use find_program()
| * ci: Unlink python2 on macOSEmmanuele Bassi2020-01-141-0/+1
| | | | | | | | Otherwise installing Python3 will break horribly.
| * build: Use find_program()gen-find-programEmmanuele Bassi2020-01-141-1/+1
|/ | | | | | Do not rely on the shebang line and the executable bit; we should use find_program(), instead, which lets Meson run a script in the appropriate environment, portably.
* Merge pull request #212 from anholt/no-autotoolsEmmanuele Bassi2019-11-2711-841/+1
|\ | | | | Remove the autotools build system.
| * Lower the minimum required version of MesonEmmanuele Bassi2019-11-261-1/+1
| | | | | | | | Makes it easier to build Epoxy on older operating systems.
| * Remove the autotools build system.Eric Anholt2019-11-2610-840/+0
|/ | | | Meson has been out for a long time, is faster, and is simpler.
* Merge pull request #213 from anholt/no-python2Emmanuele Bassi2019-11-265-9/+2
|\ | | | | Remove Python 2 support
| * Remove Python 2 supportEmmanuele Bassi2019-11-145-9/+2
| | | | | | | | | | Python 2 is going to reach EOL in January 2020, and most platforms have already moved to Python 3.
View Lorry Controller Status