summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NMake: Fix building cogl-[crate|msaa] on older VS x64cogl-latest-winChun-wei Fan2021-10-192-8/+14
| | | | | | | Due to a bug in the optimizer, the link hangs when building cogl-crate on Visual Studio 2008 x64, and causes an internal compiler error when linking cogl-msaa on pre-Visual Studio 2013 x64. Fix this by using /O1 instead of /O2 as needed on x64.
* build: Drop the Visual Studio projectsChun-wei Fan2021-10-1962-6282/+11
| | | | | They have been replaced by the NMake Makefiles, which will take over their places in build/win32.
* build: Add a set of NMake MakefilesChun-wei Fan2021-10-1912-1/+1595
| | | | | | | | | | | | | | | | | | | This adds a set of NMake Makefiles that can be used to build Cogl on Visual Studio 2008 or later, which will replace the former Visual Studio 2008/2010 project files. Improvements over the Visual Studio projects: * Configurable by the flags that are passed into the NMake command line, meaning that SDL/SDL2, Pango, Gst are enabled only if sepcified on the NMake command line. Introspection is now also optionally enabled for the libraries that are built. This will give us a more flexible builds. Unit and conformance tests are also built selectively as a result. * Easier configuration for later Visual Studio versions. * Will share the source listings that were split out from the autotools build files, for easier maintenance--we will also be able to remove the bits in the autotools build files that were used to generate the Visual Studio project files. which will be in the next commit.
* tests/conform: Split out source listingsChun-wei Fan2021-10-192-72/+76
| | | | | This way, we can make the source listing shared with other non-autotools Makefiles
* cogl-gst: Split out source listingsChun-wei Fan2021-10-192-17/+18
| | | | | This is so that source listings can be shared with other non-autools build systems, such as NMake.
* cogl-pango: Split out source listingsChun-wei Fan2021-10-192-23/+24
| | | | | This is so that other non-autotools build systems can share the source listings.
* cogl-path: Split out source listingsChun-wei Fan2021-10-192-49/+50
| | | | | This is done so that we can share the source listings with other non-autotools build systems, such as NMake.
* cogl: Split out source listingsChun-wei Fan2021-10-192-408/+492
| | | | | | Split out the source listings from cogl/Makefile.am, and make the base sources more finely split, by the base sources, the deprecated sources and common/stub winsys sources.
* cogl/cogl-defines.h.win32*.in: Conform better to cogl-defines.h.inChun-wei Fan2021-10-192-8/+8
| | | | Make things more uniform for easier maintenance.
* config.h.win32.in: Update to conform to configure.acChun-wei Fan2021-10-191-4/+20
| | | | | | | | | Some entries were added or changed in the generated config.h.in template, so update config.h.win32.in to conform better to it. Also, since we are shifting to a NMake-based build for Visual Studio, just let NMake pass the compiler define flags for the optional features that we might enable during the build.
* config.h.win32.in: Update for later Visual Studio versionsChun-wei Fan2021-10-191-22/+17
| | | | | | Visual Studio 2013+ has inttypes.h, and clean up some of the predefined entries. Also, we have strncasecmp() via using _strnicmp() on Visual Studio.
* cogl-gst: Mark public symbols for exportChun-wei Fan2021-10-191-18/+22
| | | | | | This removes the need to maintain a separate file to export the symbols on builds that do not support a regex-pattern export (such as Visual Studio).
* cogl-pango: Remove cogl-pango.symbolsChun-wei Fan2021-10-192-13/+1
| | | | It is no longer needed.
* cogl-pango: Mark public symbols for exportChun-wei Fan2021-10-191-10/+11
| | | | | This way, we no longer need to rely on cogl-pango.symbols to export symbols, simplifying maintenance.
* cogl-path: Remove cogl-path.symbolsChun-wei Fan2021-10-192-60/+0
| | | | It is no longer needed.
* Cogl-Path: Mark public symbols for exportChun-wei Fan2021-10-193-47/+51
| | | | | | This way we can use compiler directives to export public symbols, so that we do not need to kepp cogl-path.symbols around anymore, reducing maintenance efforts.
* cogl.symbols: Only keep the private symbols that we need to exportChun-wei Fan2021-10-191-1082/+2
| | | | | This is intentionally kept to remind ourselves which calls in Cogl-Path and Cogl-Pango we need to replace with Cogl's public symbols.
* test-fixtures: Mark test public symbols for exportChun-wei Fan2021-10-192-14/+16
| | | | This will ensure that the unit and conformance tests will build and run.
* cogl/winsys: Mark public APIs for exportChun-wei Fan2021-10-191-7/+9
| | | | | | | This way we can use compiler directives to export public symbols instead of relying on cogl.symbols which must be kept up-to-date. cogl.symbols is still around to remind us of the calls for Cogl's private APIs in Cogl-Path and Cogl-Pango that is still being used.
* cogl/deprecated: Mark public APIs for exportChun-wei Fan2021-10-193-17/+18
| | | | | | | This way we can reduce maintenance burden for the cogl.symbols file by using compiler directives to export public symbols. cogl.symbols is still now kept as we still need to get rid of the private API calls within Cogl-Pango and Cogl-Path.
* cogl: Mark public symbols for exportChun-wei Fan2021-10-1963-607/+707
| | | | | | | | This way we can reduce the maintenance burden for updating the cogl.symbols files for the Visual Studio builds, as we can now export symbols using __declspec(dllexport). The cogl.symbols file is still kept to remind us of the usage of private Cogl symbols in Cogl-Path and Cogl-Pango that we want to replace with public with public symbols.
* cogl-crate.c: Add fallback for data search on WindowsChun-wei Fan2021-10-191-2/+28
| | | | | | Things on Windows tend to be relocatable, so if cogl-crate failed to find crate.jpg with the hard-coded path on Windows, try again using a dynamically-constructed path.
* cogl/cogl-debug.h: Export and properly use _cogl_debug_instancesChun-wei Fan2021-10-151-4/+5
| | | | | | | | | | | | We need to also export the extern variables _cogl_debug_instances its consumption in Cogl-Path, so that it can be properly referred to by Cogl-Path and hence any other libraries that make use of them, such as Clutter. On Visual Studio DLL builds, this *must* also be marked with __declspec(dllimport) when Cogl-Path is being built against Cogl so that it can be referred to properly, otherwise one will be subject to crashes as a result.
* cogl-crate.c: Fix running on 64-bit WindowsChun-wei Fan2021-10-151-1/+11
| | | | | | | | | | | CoglPollFD uses an int type for its fd member but the GPollFD that g_poll() expects uses a gint64 type (a.k.a int64_t, __in64 on Windows) for its fd member on 64-bit Windows, which will cause loads of "WaitForMultipleObjectsEx failed:..." to be spewed from GLib on 64-bit Windows. This updates the example to use the correct types for the g_poll() call, which will avoid this kind of situation.
* cogl/cogl-bitmask.h: Use size_t instead of unsigned longChun-wei Fan2021-10-151-8/+14
| | | | | | | Using unsigned long is not safe as sizeof(long) is not necessary sizeof(void*) on some platforms, such as Windows on Visual Studio. To avoid this, use size_t instead of unsized long, and use the correct unsigned suffix accordingly.
* cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on WindowsChun-wei Fan2021-10-151-1/+10
| | | | | | Instead, we construct it according to where the Cogl DLL is found, as it is likely that the Cogl DLL will land in somewhere that is not the initial $(PREFIX)\bin on Windows.
* cogl-winsys-sdl2.c: Fix running on 32-bit WindowsChun-wei Fan2021-10-151-1/+5
| | | | | | When we query for GL APIs, we need to ensure that we are using the correct calling convention, otherwise running on 32-bit Windows will crash.
* Update Nepali translationHEADcogl-1.22Pawan Chitrakar2021-05-021-24/+20
|
* Update Catalan translationJordi Mas2021-04-251-3/+3
|
* Update Nepali translationPawan Chitrakar2021-04-221-52/+38
|
* Merge branch 'gles2' into 'cogl-1.22'Emmanuele Bassi2021-04-091-0/+1
|\ | | | | | | | | cogl-gles2: Fix undefined references. See merge request GNOME/cogl!35
| * cogl-gles2: Fix undefined references.orbea2021-03-251-0/+1
|/
* Update Galician translationFran Dieguez2021-02-231-105/+107
|
* Update Slovenian translationMatej Urbančič2021-02-171-136/+135
|
* Post-release version bump to 1.22.9Emmanuele Bassi2020-06-041-1/+1
|
* Release Cogl 1.22.81.22.8Emmanuele Bassi2020-06-042-2/+13
|
* Merge branch 'issue-14' into 'cogl-1.22'Emmanuele Bassi2020-06-041-3/+3
|\ | | | | | | | | | | | | Free state after freeing its contents Closes #14 See merge request GNOME/cogl!25
| * Free state after freeing its contentsEmmanuele Bassi2020-06-041-3/+3
|/ | | | | | | We are freeing the big state inside the CoglPipeline before freeing the snippets list, even though the snippets are stored in the big state. Fixes: #14
* Merge branch 'simple-ci' into 'cogl-1.22'Emmanuele Bassi2020-06-041-0/+48
|\ | | | | | | | | Simple ci See merge request GNOME/cogl!26
| * ci: Disable test suiteEmmanuele Bassi2020-06-041-1/+3
| | | | | | | | Needs further experiments, as it completely fails on the CI runner.
| * ci: Force GLX rendererEmmanuele Bassi2020-06-041-0/+1
| |
| * ci: Drop _FORTIFY_SOURCEEmmanuele Bassi2020-06-041-1/+1
| | | | | | | | | | Injecting this in the CPPFLAGS gets propagated into the introspection build, which is not ideal, and will generate warnings.
| * ci: Add Xvfb and run the tests under itEmmanuele Bassi2020-06-041-2/+3
| |
| * Apply suggestion to .gitlab-ci.ymlEmmanuele Bassi2020-06-041-1/+1
| |
| * ci: Add naive CIBastien Nocera2020-06-041-0/+44
|/
* Merge branch 'wip/smcv/double-close' into 'cogl-1.22'Emmanuele Bassi2020-03-101-1/+4
|\ | | | | | | | | cogl-xlib-renderer: Ensure we don't close the same X display twice See merge request GNOME/cogl!23
| * cogl-xlib-renderer: Ensure we don't close the same X display twiceSimon McVittie2020-03-101-1/+4
|/ | | | | | | | | | | | | | | | | | | | | | If we don't do this, it results in a double-free that segfaults test_atlas_migration on ES2, when running an x86_64 build under Xvfb (probably other architectures and displays, I haven't checked). ==671783==ERROR: AddressSanitizer: SEGV on unknown address ... ==671783==The signal is caused by a READ memory access. #0 0x7fbc0b5a28e7 in xcb_disconnect (...) #1 0x7fbc0bfc2be8 in XCloseDisplay (...) #2 0x7fbc0d6b8910 in _cogl_xlib_renderer_disconnect .../cogl/cogl-xlib-renderer.c:573 #3 0x7fbc0d6eba71 in _cogl_winsys_renderer_disconnect .../cogl/winsys/cogl-winsys-egl-x11.c:257 #4 0x7fbc0d6ebd7e in _cogl_winsys_renderer_connect .../cogl/winsys/cogl-winsys-egl-x11.c:289 #5 0x7fbc0d55e970 in cogl_renderer_connect .../cogl/cogl-renderer.c:687 #6 0x7fbc0d557dff in cogl_context_new .../cogl/cogl-context.c:202 #7 0x7fbc0d6fcce5 in test_utils_init .../test-fixtures/test-utils.c:176 #8 0x557c76a1c7f5 in main .../tests/conform/test-conform-main.c:90 #9 0x7fbc0c527bba in __libc_start_main ../csu/libc-start.c:308 #10 0x557c76a1b209 in _start (...) Signed-off-by: Simon McVittie <smcv@debian.org>
* Merge branch 'wip/smcv/test-timeout' into 'cogl-1.22'Emmanuele Bassi2020-03-102-0/+11
|\ | | | | | | | | [1.22] Terminate tests with SIGALRM if they take more than 120 seconds See merge request GNOME/cogl!11
| * Terminate tests with SIGALRM if they take more than 120 secondsSimon McVittie2020-03-092-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Debian autobuilders run cogl's build-time tests to get an idea of how much can be expected to work on each supported architecture. We're currently ignoring test failures and running the tests for information only, but if a test hangs, that will still cause the build to fail (and tie up an autobuilder until a rather long timeout is reached). The fork of cogl in Mutter uses a 120 second timeout for tests in its Meson build system, but other than that it's purely an arbitrary number. dbus uses a similar alarm()-based watchdog, as do a couple of tests in GLib. Bug-Debian: https://bugs.debian.org/935592 Signed-off-by: Simon McVittie <smcv@debian.org>
* | Merge branch 'wip/smcv/tests-verbose' into 'cogl-1.22'Emmanuele Bassi2020-03-101-1/+8
|\ \ | | | | | | | | | | | | [1.22] tests: Show the actual output from tests if VERBOSE is set See merge request GNOME/cogl!14
View Lorry Controller Status