summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated Occitan translationcogl-1.12Cédric Valmary2015-05-301-182/+193
|
* Added Occitan translationCédric Valmary2015-05-221-0/+360
|
* Remove vestiges of libdl / dlfcn.h as cogl uses gmodule.Patrick Welche2013-01-222-4/+0
| | | | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=691944 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 397e673446e86a9116cb7396ea094e9f8b46986e) Conflicts: cogl/Makefile.am
* bitmap: Don't try to token paste the typenames from stdint.hNeil Roberts2013-01-212-86/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the functions for packing and unpacking pixels where generated by token pasting together a function name along with its type, like the following: _cogl_pack_ ## uint8_t Then later in cogl-bitmap-conversion.c it would directly refer to the function names without token pasting. This wouldn't work however if the system headers define the stdint types using #defines instead of typedefs because in that case the function name generated using token pasting would get the expanded type name but the reference that doesn't use token pasting wouldn't. This patch adds an extra macro passed to the cogl-bitmap-packing.h header which just has the type size. That way the function can be defined like this instead: _cogl_pack_ ## 8 That should prevent it from hitting problems with #defined types. https://bugzilla.gnome.org/show_bug.cgi?id=691945 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit d6b5d7085b004ebd48c1543b820331802395ee63)
* Use the correct type for GLintptrTomeu Vizoso2013-01-081-1/+1
| | | | | | | On 32bit, intptr_t has a different type than khronos_intptr_t. https://bugzilla.gnome.org/show_bug.cgi?id=691296 (cherry picked from commit a77222385812a696a999a871cde439f50b648f69)
* Clear the scissor before calling glBlitFramebuffer in swap_regionNeil Roberts2013-01-071-0/+9
| | | | | | | | | | | | | glBlitFramebuffer is affected by the scissor so we need to ensure there is an empty clip flushed before using it. This is similar to what is done in _cogl_blit_framebuffer(). https://bugzilla.gnome.org/show_bug.cgi?id=690451 Reviewed-by: Robert Bragg <robert@linux.intel.com> Tested-by: Aaron Plattner <aplattner@nvidia.com> (cherry picked from commit 65da3f88af9c7b8d72758d116c2652aff68195c1)
* Post-release version bump to 1.12.3Robert Bragg2013-01-041-2/+2
|
* Release 1.12.2 (release)1.12.2Robert Bragg2013-01-041-3/+3
|
* Updates NEWS for the 1.12.2 releaseRobert Bragg2013-01-041-0/+37
|
* build: only build cogland with wayland-server 0.85Robert Bragg2013-01-042-1/+17
| | | | | This ensures we only try to build cogland if we have wayland-server 0.85.x since the api is incompatible with later versions.
* doc: Generate a valid cogl-context.xmlDamien Lespiau2013-01-041-2/+2
| | | | | | | | | | | The automagic paragraph support of gtk-doc is way too simple to support things like multi-paragraphs <note>s. Let's trick gtk-doc and make it generate a valid docbook snippet for cogl-context. Without this, cogl-context remains absent of the reference documentation, how sad is this?! (cherry picked from commit 606b472d91450e3221da6631020f534892e866a9)
* Update Visual C++ property sheetsChun-wei Fan2012-12-242-3/+3
| | | | Remove unneeded items.
* Fix Visual C++ 2008 "install" processChun-wei Fan2012-12-144-152/+181
| | | | | | | | Like the Visual Studio 2010 builds, the install project needs to be split into two, one for the WGL-only configs and another for the WGL+SDL configs, so that the Cogl and Cogl-Pango DLLs and LIBs can be correctly copied during the "install" stage, as the resulting DLLs for all configs land in {Release|Debug}\{Win32|x64}\bin.
* Update Visual Studio 2010 solution filesChun-wei Fan2012-12-132-2/+2
| | | | | Cosmetic change to the solution files headers so that they will be consistent across the board
* build/win32/vs*/cogl_sdl.sln: Fix line endingsChun-wei Fan2012-12-132-235/+235
| | | | | The .sln files need to have Windows/DOS line endings to work in the best way.
* build/win32/vs*/cogl_sdl.sln: Temporary commit to fix line endingsChun-wei Fan2012-12-132-235/+235
|
* opengl: Fix conditional call of BlendFuncSeparateAdam Jackson2012-12-071-2/+2
| | | | | | | | | | | | | | | Checking whether src_rgb != src_alpha twice is pointless; not checking whether dst_rgb != dst_alpha is clearly wrong. Found by Coverity. Signed-off-by: Adam Jackson <ajax@redhat.com> https://bugzilla.gnome.org/show_bug.cgi?id=689850 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit fc292c25db3004543e277d92693ab9cb388d2121)
* cogl-gles2-context: Cast func pointers to void* when fillingChun-wei Fan2012-11-241-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vtable (Sorry, I had to re-apply Neil's patch as the original one somehow did not apply) The function prototypes for the GL functions in CoglContext have the GLAPIENTRY attribute which on Windows makes them use the stdcall calling convention. The function pointers exposed from cogl-gles2.h don't have GLAPIENTRY so they end up having a different calling convention on Windows. When Cogl is compiled there it ends up giving a lot of warnings because it assigns a pointer to an incompatible function type. We probably don't want to make the functions exposed in cogl-gles2.h use the stdcall calling convention because we control that API so there is no need to introduce a second calling convention. The GLES2 context support currently isn't going to work on Windows anyway because there is no EGL or GLES2 implementation. Eventually if we make the Cogl GLES2 context virtualized on top of Cogl then we will provide our own implementations of all these functions so we can easily keep the C calling convention even on Windows. Until then to avoid the warnings on Windows we can just cast the function pointers temporarily to (void*) when filling in the vtable. This will also fix the build on Windows using Visual Studio, as it is more picky on calling convention mismatches. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* cogl.symbols: Add symbols required for Clutter 1.12Chun-wei Fan2012-11-241-0/+4
| | | | | | Those symbols were missed and are needed for Clutter-1.12.x to build. Reviewed-by: Robert Bragg <robert@linux.intel.com>
* sdl: Don't set SDL_GL_DOUBLEBUFFER when the swap chain has no prefNeil Roberts2012-11-232-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The ‘length’ for the swap chain is initially -1 which is supposed to mean ‘no preference’. However, both of the SDL winsys's were explicitly setting the SDL_GL_DOUBLEBUFFER attribute to zero in that case which would try to disable double buffering. On OS X, the equivalent to eglSwapBuffers (ie, [NSOpenGLContext flushBuffer]) does nothing for a single buffer context. The cogl-sdl-hello example does not specify the swap chain length so presumably it would end up with a single buffer config. When cogl_onscreen_swap_buffers is called it therefore does nothing and nothing is painted. I guess to make single-buffered contexts actually useful we should expose some public equivalent to glFlush so that you can ensure the rendering commands will actually hit the buffer. Alternatively we could document that cogl_onscreen_swap_buffers performs this task on single-buffered configs and then we could make the SDL winsys explicitly call glFlush in that case. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 71e57f99002d5dee79bbd44b3bc57712b99acb55)
* wayland: Port to new Wayland protocolRob Bradford2012-10-181-10/+18
| | | | | | Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit db50c3015c589375029a4c26c58db8295bb17bca)
* Added Thai translationUnticha Pramgoed2012-10-151-0/+362
|
* Updated Brazilian Portuguese TranslationRafael Ferreira2012-10-021-10/+35
|
* Updated Bulgarian translationAlexander Shopov2012-10-021-3/+19
|
* Updated Czech translationMarek Černocký2012-10-011-2/+18
|
* Use the right context when pushing the GLES2 context to an onscreenNeil Roberts2012-10-011-6/+16
| | | | | | | | | | | | | Previously when pushing the GLES2 context with an onscreen framebuffer it would just call bind_onscreen. This actually binds it with Cogl's context so presumably the context isolation wasn't working properly. This patch splits out bind_onscreen to have a second function called bind_onscreen_with_context that explicitly takes the EGL context to use. Cogl now uses this when pushing the GLES2 context. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 3653c5b10058a3f79900eb2644cb30f4cf1ca47e)
* Remove an out of date comment in the GLES2 context codeNeil Roberts2012-10-011-4/+0
| | | | | | | | | | There was a FIXME comment about making glCopyTex{Sub,}Image2D work with CoglOffscreen buffers. This has already been fixed so we should remove the comment. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 750e5668ee64a315c8090dd2223334b1e04bee54)
* egl: Only allow GLES2 context creation for the GLES2 driverNeil Roberts2012-10-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, Cogl was advertising the GLES2 context feature whenever the EGL winsys was used, even if the winsys was used with the GL driver. This wasn't working because when the GL context is created the API is set to GL with eglBindAPI and it is never changed back to GLES when the GLES2 context is created. That meant that the created context is actually GL not GLES2. Any rendering would then fail because the GL context does not understand the precision statement. It could be possible to fix it so that it will set the API correctly before creating the context. It would then also need to reset the API and unbind the previous context whenever switching between GLES2 and GL contexts. If the context isn't unbound first then eglMakeCurrent will actually try to bind both contexts at the same time and at least Mesa detects this situation and reports that the two contexts conflict. Presumably we would also need to do something more clever when we retrieve the function pointers for the GLES2 context. Currently we just copy them from the CoglContext but if the context is using the GL driver then this would mean the functions came from libGL not libGLESv2. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 624dea207cf76ae9ccd7f57c4ebd15d3bd65bff0)
* [l10n] Updated Italian translation.Milo Casagrande2012-09-291-111/+134
|
* Fix the terminator in one of the extension listsNeil Roberts2012-09-281-1/+1
| | | | | | | | | | | | The list of extension names in COGL_EXT_BEGIN should be a zero separated list of strings which is terminated by an empty string. The name for the GL_ARB_shader_objects extension was missing the zero separator so presumably it was relying on the following byte to happen to be a zero in order not to crash. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f63381f23fa8b0b17e030561940b8a38efff221f)
* winsys-glx: Remove the vblank counter feature when indirect renderingNeil Roberts2012-09-281-0/+3
| | | | | | | | | | | | | | | | Previously when Cogl detects that the GLX context is indirect it resets the function pointers for the VBLANK_COUNTER feature to NULL. However it wasn't removing the VBLANK_COUNTER feature flag. Some other parts of the winsys check for that feature flag rather than checking whether the pointer is NULL so it would end up calling an invalid function pointer and crashing. This just fixes it to also clear the feature flag. https://bugzilla.gnome.org/show_bug.cgi?id=684917 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit e947c713a541086f80a308d22774229f0720196a)
* Clean up Visual C++ projectsChun-wei Fan2012-09-2816-1438/+174
| | | | | | | | | | | Since commit 7253c5ca (Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when apps are built), on Visual C++ we link to SDL.lib and SDLmain.lib using a #pragma comment directive in cogl/cogl-sdl.h, so we no longer need specific project configs for Cogl programs which build against a Cogl built with SDL. This removes those unneeded configs. Also "install" cogl/cogl-sdl.h when Cogl is built with the SDL winsys, as it is a needed header
* Update Visual C++ projectsChun-wei Fan2012-09-286-109/+126
| | | | | | | -Make "install" parts for VS9 and VS10 more consistent with each other -Create the .def files in the respective intermediate/.obj folders, so that it is cleaner duringg the build -Make up for missed files to "install"
* Updated Lithuanian translationAurimas Černius2012-09-271-2/+18
|
* Updated Serbian translationМирослав Николић2012-09-272-4/+36
|
* Updated Belarusian translation.Ihar Hrachyshka2012-09-261-2/+18
|
* Updated Latvian translationRūdolfs Mazurs2012-09-261-11/+34
|
* Updated Greek translationTom Tryfonidis2012-09-261-14/+19
|
* Update French translationAndika Triwidada2012-09-261-13/+34
|
* Updated Indonesian translationAndika Triwidada2012-09-261-3/+21
|
* Post-release version bump to 1.12.1Robert Bragg2012-09-241-2/+2
|
* Merge branch 'cogl-1.12-release' into cogl-1.12Robert Bragg2012-09-2413-440/+988
|\
| * Release 1.12.0 (release)1.12.0Robert Bragg2012-09-241-3/+3
| |
| * Updates NEWS for the 1.12.0 releaseRobert Bragg2012-09-241-0/+27
| |
| * Updated Russian translationYuri Myasoedov2012-09-241-23/+42
| | | | | | | | (cherry picked from commit c34e8bb0ca44c90d05753e6790727a462d7fd732)
| * [l10n] Updated German translationMario Blättermann2012-09-241-20/+41
| | | | | | | | (cherry picked from commit b9afd31baabf1e139f51e6042104ab0904e77488)
| * Update zh_CN translationYunQiang Su2012-09-241-31/+28
| | | | | | | | (cherry picked from commit 7003bd0bf092ea38eab4491ecb56cb8db155190a)
| * Updated Malayalam fileAni Peter2012-09-241-0/+342
| | | | | | | | (cherry picked from commit 9cdaf2e8e13c9b255343357e95038e1881578bf7)
| * [l10n] Update Japanese translationNishio Futoshi2012-09-241-20/+40
| | | | | | | | (cherry picked from commit 857f9d336ba1940211becfdd637dcfe08b52e079)
| * updated Tamil translationDr.T.Vasudevan2012-09-241-123/+130
| | | | | | | | (cherry picked from commit af265ab5d2e2f2dab8294c549e872ef3b2fdf1d3)
View Lorry Controller Status