summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch')
-rw-r--r--recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch75
1 files changed, 24 insertions, 51 deletions
diff --git a/recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch b/recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch
index 9a80d9ed..cfe8f605 100644
--- a/recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch
+++ b/recipes-graphics/wayland/weston/0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch
@@ -15,10 +15,10 @@ Signed-off-by: Prabhu <prabhu.sundararaj@freescale.com>
15 create mode 100644 src/gal2d-renderer.c 15 create mode 100644 src/gal2d-renderer.c
16 create mode 100644 src/gal2d-renderer.h 16 create mode 100644 src/gal2d-renderer.h
17 17
18Index: weston-1.11.0/Makefile.am 18Index: weston-1.11.1/Makefile.am
19=================================================================== 19===================================================================
20--- weston-1.11.0.orig/Makefile.am 2016-05-19 16:36:04.000000000 -0500 20--- weston-1.11.1.orig/Makefile.am 2016-09-20 19:35:22.000000000 -0500
21+++ weston-1.11.0/Makefile.am 2016-09-20 15:28:46.634190725 -0500 21+++ weston-1.11.1/Makefile.am 2017-01-14 08:35:10.000000000 -0600
22@@ -247,6 +247,18 @@ 22@@ -247,6 +247,18 @@
23 src/vertex-clipping.h \ 23 src/vertex-clipping.h \
24 shared/helpers.h 24 shared/helpers.h
@@ -38,10 +38,10 @@ Index: weston-1.11.0/Makefile.am
38 38
39 if ENABLE_X11_COMPOSITOR 39 if ENABLE_X11_COMPOSITOR
40 module_LTLIBRARIES += x11-backend.la 40 module_LTLIBRARIES += x11-backend.la
41Index: weston-1.11.0/src/compositor-fbdev.c 41Index: weston-1.11.1/src/compositor-fbdev.c
42=================================================================== 42===================================================================
43--- weston-1.11.0.orig/src/compositor-fbdev.c 2016-05-19 16:36:04.000000000 -0500 43--- weston-1.11.1.orig/src/compositor-fbdev.c 2016-09-20 19:35:22.000000000 -0500
44+++ weston-1.11.0/src/compositor-fbdev.c 2016-09-20 17:05:27.000000000 -0500 44+++ weston-1.11.1/src/compositor-fbdev.c 2017-01-14 08:35:11.000000000 -0600
45@@ -50,6 +50,7 @@ 45@@ -50,6 +50,7 @@
46 #include "libinput-seat.h" 46 #include "libinput-seat.h"
47 #include "gl-renderer.h" 47 #include "gl-renderer.h"
@@ -263,10 +263,10 @@ Index: weston-1.11.0/src/compositor-fbdev.c
263 config->output_transform = WL_OUTPUT_TRANSFORM_NORMAL; 263 config->output_transform = WL_OUTPUT_TRANSFORM_NORMAL;
264 } 264 }
265 265
266Index: weston-1.11.0/src/gal2d-renderer.c 266Index: weston-1.11.1/src/gal2d-renderer.c
267=================================================================== 267===================================================================
268--- /dev/null 1970-01-01 00:00:00.000000000 +0000 268--- /dev/null 1970-01-01 00:00:00.000000000 +0000
269+++ weston-1.11.0/src/gal2d-renderer.c 2016-09-20 16:58:24.000000000 -0500 269+++ weston-1.11.1/src/gal2d-renderer.c 2017-01-14 08:35:10.000000000 -0600
270@@ -0,0 +1,1342 @@ 270@@ -0,0 +1,1342 @@
271+/* 271+/*
272+ * Copyright (c) 2015 Freescale Semiconductor, Inc. 272+ * Copyright (c) 2015 Freescale Semiconductor, Inc.
@@ -1610,10 +1610,10 @@ Index: weston-1.11.0/src/gal2d-renderer.c
1610+ .output_create = gal2d_renderer_output_create, 1610+ .output_create = gal2d_renderer_output_create,
1611+ .output_destroy = gal2d_renderer_output_destroy, 1611+ .output_destroy = gal2d_renderer_output_destroy,
1612+}; 1612+};
1613Index: weston-1.11.0/src/gal2d-renderer.h 1613Index: weston-1.11.1/src/gal2d-renderer.h
1614=================================================================== 1614===================================================================
1615--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1615--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1616+++ weston-1.11.0/src/gal2d-renderer.h 2016-09-20 15:28:46.638190745 -0500 1616+++ weston-1.11.1/src/gal2d-renderer.h 2017-01-14 08:35:10.000000000 -0600
1617@@ -0,0 +1,50 @@ 1617@@ -0,0 +1,50 @@
1618+/* 1618+/*
1619+ * Copyright (c) 2015 Freescale Semiconductor, Inc. 1619+ * Copyright (c) 2015 Freescale Semiconductor, Inc.
@@ -1665,10 +1665,10 @@ Index: weston-1.11.0/src/gal2d-renderer.h
1665+}; 1665+};
1666+ 1666+
1667+#endif 1667+#endif
1668Index: weston-1.11.0/src/compositor-fbdev.h 1668Index: weston-1.11.1/src/compositor-fbdev.h
1669=================================================================== 1669===================================================================
1670--- weston-1.11.0.orig/src/compositor-fbdev.h 2016-05-19 16:36:04.000000000 -0500 1670--- weston-1.11.1.orig/src/compositor-fbdev.h 2016-09-20 19:35:22.000000000 -0500
1671+++ weston-1.11.0/src/compositor-fbdev.h 2016-09-20 17:03:37.000000000 -0500 1671+++ weston-1.11.1/src/compositor-fbdev.h 2017-01-14 08:35:10.000000000 -0600
1672@@ -40,6 +40,7 @@ 1672@@ -40,6 +40,7 @@
1673 int tty; 1673 int tty;
1674 char *device; 1674 char *device;
@@ -1677,59 +1677,32 @@ Index: weston-1.11.0/src/compositor-fbdev.h
1677 1677
1678 uint32_t output_transform; 1678 uint32_t output_transform;
1679 }; 1679 };
1680Index: weston-1.11.0/src/main.c 1680Index: weston-1.11.1/src/main.c
1681=================================================================== 1681===================================================================
1682--- weston-1.11.0.orig/src/main.c 2016-05-19 16:36:04.000000000 -0500 1682--- weston-1.11.1.orig/src/main.c 2017-01-14 08:34:10.030218137 -0600
1683+++ weston-1.11.0/src/main.c 2016-09-20 17:29:12.000000000 -0500 1683+++ weston-1.11.1/src/main.c 2017-01-14 08:54:45.000000000 -0600
1684@@ -285,7 +285,13 @@ 1684@@ -285,7 +285,13 @@
1685 "Options for fbdev-backend.so:\n\n" 1685 "Options for fbdev-backend.so:\n\n"
1686 " --tty=TTY\t\tThe tty to use\n" 1686 " --tty=TTY\t\tThe tty to use\n"
1687 " --device=DEVICE\tThe framebuffer device to use\n" 1687 " --device=DEVICE\tThe framebuffer device to use\n"
1688- " --use-gl\t\tUse the GL renderer\n\n"); 1688- " --use-gl\t\tUse the GL renderer\n\n");
1689+#if defined ENABLE_EGL 1689+#if defined ENABLE_EGL
1690+ " --no-use-gl\t\tDo not use the GL renderer\n" 1690+ " --use-gl=1\t\tUse the GL renderer (default is 1)\n"
1691+ " --use-gal2d\t\tUse the GAL2D renderer\n\n"); 1691+ " --use-gal2d=1\t\tUse the GAL2D renderer (default is 0)\n\n");
1692+#else 1692+#else
1693+ " --use-gl\t\tUse the GL renderer\n" 1693+ " --use-gl=1\t\tUse the GL renderer (default is 0)\n"
1694+ " --no-use-gal2d\t\tDo not use the GAL2D renderer\n\n"); 1694+ " --use-gal2d=1\t\tUse the GAL2D renderer (default is 1)\n\n");
1695+#endif 1695+#endif
1696 #endif 1696 #endif
1697 1697
1698 #if defined(BUILD_HEADLESS_COMPOSITOR) 1698 #if defined(BUILD_HEADLESS_COMPOSITOR)
1699@@ -864,18 +870,35 @@ 1699@@ -868,7 +874,8 @@
1700 struct weston_config_section *section;
1701 char *s = NULL;
1702 int ret = 0;
1703+#ifdef ENABLE_EGL
1704+ /* GL rendering is default, so user options are --no-use-gl and --use-gal2d */
1705+ int no_use_gl = 0;
1706+#else
1707+ /* GAL2D rendering is default, so user options are --use-gl and --no-use-gal2d */
1708+ int no_use_gal2d = 0;
1709+#endif
1710
1711 const struct weston_option fbdev_options[] = { 1700 const struct weston_option fbdev_options[] = {
1712 { WESTON_OPTION_INTEGER, "tty", 0, &config.tty }, 1701 { WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
1713 { WESTON_OPTION_STRING, "device", 0, &config.device }, 1702 { WESTON_OPTION_STRING, "device", 0, &config.device },
1714+#ifdef ENABLE_EGL 1703- { WESTON_OPTION_BOOLEAN, "use-gl", 0, &config.use_gl },
1715+ { WESTON_OPTION_BOOLEAN, "no-use-gl", 0, &no_use_gl }, 1704+ { WESTON_OPTION_INTEGER, "use-gl", 0, &config.use_gl },
1716+ { WESTON_OPTION_BOOLEAN, "use-gal2d", 0, &config.use_gal2d }, 1705+ { WESTON_OPTION_INTEGER, "use-gal2d", 0, &config.use_gal2d },
1717+#else
1718 { WESTON_OPTION_BOOLEAN, "use-gl", 0, &config.use_gl },
1719+ { WESTON_OPTION_BOOLEAN, "no-use-gal2d", 0, &no_use_gal2d },
1720+#endif
1721 }; 1706 };
1722 1707
1723 parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv); 1708 parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv);
1724
1725 if (!config.device)
1726 config.device = strdup("/dev/fb0");
1727-
1728+#ifdef ENABLE_EGL
1729+ config.use_gl = !no_use_gl;
1730+#else
1731+ config.use_gal2d = !no_use_gal2d;
1732+#endif
1733 section = weston_config_get_section(wc, "output", "name", "fbdev");
1734 weston_config_section_get_string(section, "transform", &s, "normal");
1735 if (weston_parse_transform(s, &config.output_transform) < 0)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-04 00:33:27 +0000