summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* wayland: Port to new Wayland protocolrbradford/cogl-1.12/wayland-0.99Rob Bradford2012-10-121-10/+18
|
* 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)
| * updated Tamil translationDr.T.Vasudevan2012-09-241-71/+89
| | | | | | | | (cherry picked from commit 1b7743f0c29981b4d91ca9faa16fa4543662c2a7)
| * Updated Bulgarian translationAlexander Shopov2012-09-241-2/+16
| | | | | | | | (cherry picked from commit 93d7defa7fbb1a9ccb56beef882699008b7b9d44)
| * hindi updateRajesh Ranjan2012-09-241-23/+43
| | | | | | | | (cherry picked from commit 38201324e9543fa4c4b613829b6c1199778f02d5)
| * Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when apps are builtChun-wei Fan2012-09-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to SDL.lib and SDLmain.lib if Cogl was built with the SDL winsys. Recent changes to the SDL winsys introduced a direct dependency to SDLmain.lib (and hence SDL.lib) when programs are built, causing linker errors to appear when any programs using cogl (with the SDL winsys built in) are built. Since we cannot determine whether a Cogl build is built with the SDL winsys at build time easily, we could use #pragma comment (lib, ...) whenever cogl-sdl.h is included by cogl.h so that SDLmain.lib and SDL.lib is linked into the resulting binary, so that the program can link and run correctly. This does not add any external dependencies as the Cogl DLL already depends on SDL.dll when it is built with the SDL winsys. https://bugzilla.gnome.org/show_bug.cgi?id=682071 (cherry picked from commit 2921d2a4d9c79f1ca7530171e0dfa8c945607bc7)
| * [l10n]Updated Catalan (Valencian) translationCarles Ferrando2012-09-241-18/+40
| | | | | | | | (cherry picked from commit 829e090deb5decbeb60519c26199a403ae8174b0)
| * [l10n] Updated Catalan translationGil Forcada2012-09-241-19/+41
| | | | | | | | (cherry picked from commit 1a39fb66c1531ef53c8a700fc85bde1fb97bc624)
| * Updated Danish translationAsk H. Larsen2012-09-241-103/+122
| | | | | | | | (cherry picked from commit bb5220dbd98517544d0ff8676061024fd8a361f3)
* | Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when apps are builtChun-wei Fan2012-09-191-0/+9
|/ | | | | | | | | | | | | | | | | Link to SDL.lib and SDLmain.lib if Cogl was built with the SDL winsys. Recent changes to the SDL winsys introduced a direct dependency to SDLmain.lib (and hence SDL.lib) when programs are built, causing linker errors to appear when any programs using cogl (with the SDL winsys built in) are built. Since we cannot determine whether a Cogl build is built with the SDL winsys at build time easily, we could use #pragma comment (lib, ...) whenever cogl-sdl.h is included by cogl.h so that SDLmain.lib and SDL.lib is linked into the resulting binary, so that the program can link and run correctly. This does not add any external dependencies as the Cogl DLL already depends on SDL.dll when it is built with the SDL winsys.
* Post-release version bump to 1.11.7Robert Bragg2012-09-171-2/+2
|
* Release 1.11.6 (snapshot)1.11.6Robert Bragg2012-09-171-3/+3
|
* Updates NEWS for the 1.11.6 releaseRobert Bragg2012-09-171-0/+37
|
* gles2-context: Don't split the wrapper snippet into twoNeil Roberts2012-09-171-51/+36
| | | | | | | | | | | | | | | | | | | | | | | We don't need to split the wrapper snippet into two separate parts because it should be ok to declare the flip uniform in the middle of the shader as long as it is somewhere in the global scope. Therefore we can just declare it right before the definition for the replacement main function. This is important because we don't want to put anything at the top of the application's shader in case it is using a '#version' directive. In that case moving it to anything other than the first line would break things. This patch also adds a marker in a comment around the wrapper snippet so that we can easily locate the snippet when glGetShaderSource is called and remove it. The wrapper for glGetAttachedShaders has been removed because there are no longer any additional shaders attached to the program so we can just let GL handle it directly. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit dbd92e24ae61dcbe7ef26f61c9117c5516a7fa87)
* gles2-context: only insert prelude + wrapper into strv onceRobert Bragg2012-09-171-25/+30
| | | | | | | | | | | | | | | | | In our wrapper for glShaderSource we special case when a vertex shader is being specified so we can sneak in a wrapper for the main function to potentially flip all rendering upside down for better integration with Cogl. Previously we were appending the wrapper to all the sub-strings passed via the vector of strings to glShaderSource but we now grow the vector instead and insert the prelude and wrapper strings into the beginning and end of the vector respectively so we should only have one copy for a single shader. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit d2904d518718e3fbf4441abe2c2bcfd63edfd64b)
* cogl-gles2-context: Append wrapper shader to user shadersDaniel Stone2012-09-172-50/+25
| | | | | | | | | | | | | | | | | The SGX GLSL compiler refuses to accept shaders of the form: void foo(); void bar() { foo(); } where foo is undefined at glShaderSource() time, left for definition at link time. To work around this, simply append the wrapper shader to user shaders, rather than building a separate shader that's always linked with user shaders. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 96f02c445f763ace088be71dc32b3374b2cdbab2)
* gpu-info: Match latest Mesa stringsRobert Bragg2012-09-171-1/+4
| | | | | | | | | | | | Mesa now reports a vendor string of "Mesa Project" instead of "VMWare, Inc." and the software rasterizer renderer string is now "Software Rasterizer". This update cogl-gpu-info.c to recognize these new strings. Thanks to Alexander Larsson for the original patch. https://bugzilla.gnome.org/show_bug.cgi?id=683818 (cherry picked from commit dfacbbd96f3fbadaffa4a76dfd71c47ece6ed6a3)
* texture: Add a context pointer to each textureRobert Bragg2012-09-179-91/+86
| | | | | | | | | | | As part of our on-going goal to remove our dependence on a global Cogl context this patch adds a pointer to the context to each CoglTexture so that the various texture apis no longer need to use _COGL_GET_CONTEXT. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 83131072eea395f18ab0525ea2446f443a6033b1)
* Don't take internal references on the contextRobert Bragg2012-09-177-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | | We want applications to fully control the lifetime of a CoglContext without having to worry that internal resources (such as the default 2d,3d and rectangle textures, or any caches we maintain) could result in circular references that keep the context alive. We also want to avoid making CoglContext into a special kind of object that isn't ref-counted or that can't be used with object apis such as cogl_object_set_user_data. Being able to reliably destroy the context is important on platforms such as Android where you may be required bring-up and tear-down a CoglContext numerous times throughout the applications lifetime. A dissadvantage of this policy is that it is now possible to leave other object such as framebuffers in an inconsistent state if the context is unreferenced and destroyed. The documentation states that all objects that directly or indirectly depend on a context that has been destroyed will be left in an inconsistent state and must not be accessed thereafter. Applications (such as Android applications) that need to cleanly destroy and re-create Cogl resources should make sure to manually unref these dependant objects before destroying the context. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 23ce51beba1bb739a224e47614a59327dfbb65af)
* Avoid referencing file scope context in _context_new()Robert Bragg2012-09-171-20/+20
| | | | | | | | | | | | cogl_context_new() had a mixture of references to the file scope context variable (_context) and the local (context) variable. This renames the file scope variable to _cogl_context to catch unnecessary references to the old name and fixes the code accordingly to reference the local variable instead. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 33a9397ee1ae1729200be2e5084cf43cebb64289)
* texture-2d: improve new_from_foreign error handlingRobert Bragg2012-09-171-14/+38
| | | | | | | | | | | There were lots of places where cogl_texture_2d_new_from_foreign would simply return NULL without returning a corresponding error. We now return an error wherever we are returning NULL except in cases where the user provided invalid data. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit a1efc9405a13ac8aaf692c5f631a3b8f95d2f259)
* Updated Belarusian translation.Ihar Hrachyshka2012-09-171-7/+18
| | | | (cherry picked from commit ded3f51fd6f853ed179bcdf585350b64bae4f80c)
* Updated Czech translationMarek Černocký2012-09-171-16/+15
| | | | (cherry picked from commit 0638b17fbde629e5dfaf7e28ecb6da43b408b3ba)
View Lorry Controller Status