Compare commits

...

4 Commits

Author SHA1 Message Date
Stefan Schmidt c2f92e6d86 TESTING 2020-06-16 16:25:58 +02:00
Stefan Schmidt 685e231d66 evas_ gl_common: comment out not reachable code
In commit 7dbe886f58 this was changed. I
can only guess it was a side effect during development.

Before that the code was actually commented out and not used for 10
years (47fbbe6196)

CID: 1132634

Differential Revision: https://phab.enlightenment.org/D11981
2020-06-16 16:19:59 +02:00
Stefan Schmidt 6637fb3aec modules: eina: chained_pool: check for NULL before passing it to deref
Make sure we check if pool->first_fill is NULL before passing it onwards
where it gets dereferenced. In case this happens return NULL instead of
garbage.

CID: 1293520

Differential Revision: https://phab.enlightenment.org/D11980
2020-06-16 16:19:59 +02:00
Stefan Schmidt 2784feff24 Revert "ci: travis: disable the webp loader on CI builds for now"
This reverts commit 29c491b977.

We went back to a much older version which should be available on all
our CI test systems. Safe to enable again.
2020-06-16 16:19:04 +02:00
4 changed files with 7 additions and 27 deletions

View File

@ -6,8 +6,7 @@ travis_fold start "meson"
travis_time_start "meson"
if [ "$DISTRO" != "" ] ; then
# Why do we need to disable the imf loaders here?
# Once libwebp 1.1.0 is available in more distros we can enable it by default again
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
@ -99,7 +98,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false
else # Native Ubuntu Linux Travis builds (non-docker)
OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
OPTS="$OPTS -Dbindings="

View File

@ -58,39 +58,30 @@ jobs:
- os: linux
env: DISTRO=Fedora32 CI_BUILD_TYPE=default
- os: linux
if: type = cron
env: DISTRO=Fedora32 CI_BUILD_TYPE=release-ready
- os: linux
if: type = cron
env: DISTRO=Ubuntu2004
- os: linux
if: type = cron
env: DISTRO=Ubuntu1910
- os: linux
if: type = cron
env: DISTRO=Debian103
- os: linux
if: type = cron
env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
- os: linux
if: type = cron
env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
- os: linux
if: type = cron
env: DISTRO=Fedora32-exactness CI_BUILD_TYPE=exactness
- os: linux
if: type = cron
env: CI_BUILD_TYPE=codecov
- os: linux
if: type = cron
arch: arm64
env: CI_BUILD_TYPE=default
- os: linux
if: type = cron
arch: ppc64le
env: CI_BUILD_TYPE=no-bindings
- os: linux
if: type = cron
arch: s390x
env: CI_BUILD_TYPE=no-bindings
@ -144,14 +135,3 @@ before_cache:
mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
fi
notifications:
irc:
channels:
- "chat.freenode.net#edevelop"
on_success: change
on_failure: always
template:
- "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
- "Commit: %{commit_subject} (%{commit}) from %{author}"
- "Change view : %{compare_url}"
- "Build details : %{build_url}"

View File

@ -274,7 +274,7 @@ eina_chained_mempool_malloc(void *data, EINA_UNUSED unsigned int size)
{
Chained_Mempool *pool = data;
Chained_Pool *p = NULL;
void *mem;
void *mem = NULL;
if (!eina_spinlock_take(&pool->mutex))
{
@ -321,10 +321,10 @@ eina_chained_mempool_malloc(void *data, EINA_UNUSED unsigned int size)
_eina_chained_mp_pool_cmp, NULL);
}
mem = _eina_chained_mempool_alloc_in(pool, pool->first_fill);
if (pool->first_fill)
mem = _eina_chained_mempool_alloc_in(pool, pool->first_fill);
eina_spinlock_release(&pool->mutex);
return mem;
}

View File

@ -1847,13 +1847,14 @@ vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n)
{
return 1;
// this fixup breaks for expedite test 32. why?
// for reference
/* for reference
if ((gc->pipe[pn].array.num + n) > gc->shared->info.max_vertex_elements)
{
shader_array_flush(gc);
return 0;
}
return 1;
*/
}
static int