This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 277f9481122b3c6d37e5454251df959a3331a707
Merge: 4d08d41f8f e6b43c2e08
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 17:37:47 2024 +0500
Merge remote-tracking branch 'upstream/master' into dev/dimmus/test
src/lib/ecore_evas/Ecore_Evas.h | 22 +-
src/lib/ecore_evas/ecore_evas.c | 39 +
src/lib/ecore_evas/ecore_evas_module.c | 3 +
src/lib/ecore_x/Ecore_X.h | 37 +-
src/lib/elementary/efl_ui_win.c | 5 +
src/lib/elementary/elm_config.c | 6 +
src/lib/elementary/elm_priv.h | 1 +
src/lib/elementary/elm_win.h | 2 +
src/lib/evas/file/evas_module.c | 4 +
.../ecore_evas/engines/win32/ecore_evas_win32.c | 83 +
src/modules/ecore_evas/engines/win32/meson.build | 11 +-
src/modules/evas/engines/gl_common/evas_gl_api.c | 9 +-
.../evas/engines/gl_common/evas_gl_api_ext.c | 5 +-
.../evas/engines/gl_common/evas_gl_api_gles1.c | 9 +-
src/modules/evas/engines/gl_common/evas_gl_core.c | 23 +-
.../evas/engines/gl_common/evas_gl_file_cache.c | 12 +-
.../evas/engines/gl_common/evas_gl_shader.c | 25 +
src/modules/evas/engines/gl_generic/evas_engine.c | 4 +-
.../evas/engines/gl_win32/Evas_Engine_GL_Win32.h | 33 +
src/modules/evas/engines/gl_win32/evas_engine.c | 2200 ++++++++++++++++++++
src/modules/evas/engines/gl_win32/evas_engine.h | 180 ++
.../evas/engines/gl_win32/evas_win32_main.c | 1102 ++++++++++
src/modules/evas/engines/gl_win32/meson.build | 19 +
src/modules/evas/engines/gl_x11/evas_engine.h | 13 +-
src/modules/evas/engines/meson.build | 76 +-
25 files changed, 3854 insertions(+), 69 deletions(-)
diff --cc src/modules/ecore_evas/engines/win32/meson.build
index afe8efb62e,84c2a176e2..d964a76a2b
--- a/src/modules/ecore_evas/engines/win32/meson.build
+++ b/src/modules/ecore_evas/engines/win32/meson.build
@@@ -1,9 -1,14 +1,14 @@@
config_h.set('BUILD_ECORE_EVAS_SOFTWARE_DDRAW', '1')
config_h.set('BUILD_ECORE_EVAS_SOFTWARE_GDI', '1')
- engine_deps = [engine_software_ddraw, engine_software_gdi]
-engine_src = files(['ecore_evas_win32.c'])
++engine_src = files('ecore_evas_win32.c')
+
+ engine_deps += [engine_software_ddraw, engine_software_gdi]
+
-if get_option('opengl') != 'none'
++if OPENGL != 'none'
+ config_h.set('BUILD_ECORE_EVAS_OPENGL_WIN32', '1')
+ engine_deps += [engine_gl_win32]
+ endif
shared_module(mod_full_name, engine_src,
c_args : package_c_args,
diff --cc src/modules/evas/engines/meson.build
index 8602eccb98,19179a2892..84ca0df0f2
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@@ -1,40 -1,50 +1,50 @@@
engines = [
- ['buffer', []],
- ['fb', ['fb']],
- ['drm', ['drm']],
- ['software_x11', ['x11']],
- ['wayland_shm', ['wl']],
+ ['buffer', []]
]
-if sys_windows
+if WINDOWS
- engines += [
- ['software_ddraw', []],
- ['software_gdi', []],
- ]
- endif
-
- have_gl_engine = false
-
- if OPENGL != 'none'
- engines += [['gl_x11', ['x11']]]
- have_gl_engine = true
- endif
-
- if OPENGL == 'full'
- engines += [['gl_cocoa', ['cocoa']]]
- have_gl_engine = true
- endif
-
- if OPENGL == 'es-egl'
engines += [
- ['wayland_egl', ['wl']],
- ['gl_drm', ['drm']]
- ]
- have_gl_engine = true
- endif
+ ['software_ddraw', []],
+ ['software_gdi', []],
+ ]
- if get_option('opengl') == 'es-egl'
++ if OPENGL == 'es-egl'
+ engines += [
+ ['gl_win32', []],
+ ['gl_generic', []]
+ ]
+ have_gl_engine = true
+ endif
+ else
+ engines += [
+ ['fb', ['fb']],
+ ['drm', ['drm']],
+ ['software_x11', ['x11']],
+ ['wayland_shm', ['wl']],
+ ]
- if have_gl_engine
- engines += [['gl_generic', []]]
+ have_gl_engine = false
+
- if get_option('opengl') != 'none'
++ if OPENGL != 'none'
+ engines += [['gl_x11', ['x11']]]
+ have_gl_engine = true
+ endif
+
- if get_option('opengl') == 'full'
++ if OPENGL == 'full'
+ engines += [['gl_cocoa', ['cocoa']]]
+ have_gl_engine = true
+ endif
+
- if get_option('opengl') == 'es-egl'
++ if OPENGL == 'es-egl'
+ engines += [
+ ['wayland_egl', ['wl']],
+ ['gl_drm', ['drm']]
+ ]
+ have_gl_engine = true
+ endif
+
+ if have_gl_engine
+ engines += [['gl_generic', []]]
+ endif
endif
foreach engine_conf : engines
@@@ -51,7 -61,7 +61,7 @@@
include_directories: include_directories(engine),
)
-- var_name = 'engine_'+engine
++ var_name = 'engine_' + engine
set_variable(var_name, engine_dep)
mod_full_name = engine
@@@ -62,7 -72,7 +72,7 @@@
subdir(engine)
-- config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1')
++ config_h.set('BUILD_ENGINE_' + engine.to_upper(), '1')
endif
endforeach
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
