From jordan.l.justen at intel.com Mon Jul 23 10:53:12 2012 From: jordan.l.justen at intel.com (Jordan Justen) Date: Mon, 23 Jul 2012 10:53:12 -0700 Subject: [waffle] [PATCH] cmake: add ${CMAKE_INSTALL_PREFIX}/include to include paths Message-ID: <1343065992-6092-1-git-send-email-jordan.l.justen@intel.com> This allows building under a prefix where updated waffle dependencies will have installed their updated include files. Signed-off-by: Jordan Justen --- src/waffle/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt index 3117198..f777bc0 100644 --- a/src/waffle/CMakeLists.txt +++ b/src/waffle/CMakeLists.txt @@ -111,6 +111,8 @@ if(waffle_has_x11_egl) ) endif() +include_directories ("${CMAKE_INSTALL_PREFIX}/include") + # CMake will pass to the C compiler only C sources. CMake does not recognize the # .m extension and ignores any such files in the source lists. To coerce CMake # to pass .m files to the compiler, we must lie and claim that they are -- 1.7.9.5 From jordan.l.justen at intel.com Mon Jul 30 13:01:12 2012 From: jordan.l.justen at intel.com (Jordan Justen) Date: Mon, 30 Jul 2012 13:01:12 -0700 Subject: [waffle] [PATCH] glx: fix attrib list end token Message-ID: <1343678473-14351-1-git-send-email-jordan.l.justen@intel.com> It seems this list should be terminated by 0 rather than GLX_NONE. http://www.opengl.org/registry/specs/ARB/glx_create_context.txt " specifies a list of attributes for the context. The list consists of a sequence of pairs terminated by the value None (0)." Signed-off-by: Jordan Justen --- src/waffle/glx/glx_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/waffle/glx/glx_context.c b/src/waffle/glx/glx_context.c index 85f8de1..1b09611 100644 --- a/src/waffle/glx/glx_context.c +++ b/src/waffle/glx/glx_context.c @@ -105,7 +105,7 @@ glx_context_fill_attrib_list(struct glx_config *config, } } - attrib_list[i++] = GLX_NONE; + attrib_list[i++] = 0; return true; } -- 1.7.11.1 From jordan.l.justen at intel.com Mon Jul 30 18:10:39 2012 From: jordan.l.justen at intel.com (Jordan Justen) Date: Mon, 30 Jul 2012 18:10:39 -0700 Subject: [waffle] [PATCH] linux_dl: Use libGL.so.1 for WAFFLE_DL_OPENGL Message-ID: <1343697039-21535-1-git-send-email-jordan.l.justen@intel.com> Use libGL.so.1 rather than libGL.so to lock down the library ABI version. Signed-off-by: Jordan Justen --- src/waffle/linux/linux_dl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/waffle/linux/linux_dl.c b/src/waffle/linux/linux_dl.c index 68b0fc2..a9bfae4 100644 --- a/src/waffle/linux/linux_dl.c +++ b/src/waffle/linux/linux_dl.c @@ -53,7 +53,7 @@ static const char* linux_dl_get_name(int32_t waffle_dl) { switch (waffle_dl) { - case WAFFLE_DL_OPENGL: return "libGL.so"; + case WAFFLE_DL_OPENGL: return "libGL.so.1"; case WAFFLE_DL_OPENGL_ES1: return "libGLESv1_CM.so"; case WAFFLE_DL_OPENGL_ES2: return "libGLESv2.so"; default: -- 1.7.11.1 From juha-pekka.heikkila at linux.intel.com Tue Jul 31 05:16:18 2012 From: juha-pekka.heikkila at linux.intel.com (Juha-Pekka =?iso-8859-1?Q?Heikkil=E4?=) Date: Tue, 31 Jul 2012 15:16:18 +0300 (EEST) Subject: [waffle] [PATCH] Enabling Waffle library for Android. In-Reply-To: <4FEB5BE7.9040807@linux.intel.com> References: <46327.10.237.72.152.1340709522.squirrel@linux.intel.com> <4FEB5BE7.9040807@linux.intel.com> Message-ID: <57255.10.237.72.59.1343736978.squirrel@linux.intel.com> Here is now reworked version of the big patch, again in the attachment. Tabs should be now gone :) I mostly managed to follow your suggestions. I did stick with the structure most of the files being .c files with just one .cpp file, reason for this was "DEFINE_CONTAINER_CAST_FUNC" define which did not play nice with cpp and changing this define would cause me to change too many places which I cannot test and probably break them. waffle_android_window now has a pointer called pSFContainer that point to android_surfaceflinger_container structure defined in android_surfaceflingerlink.cpp. This structure contain Android related classes. This way of providing access to these classes is again because of the mixture of c and cpp. The idea you mentioned piglit soon also accepting window input is going to need some extra work on Android side. Currently I have the created surface(s) floating on top of normal Android UI where Android will receive all input and my surfaces input-wise behave as if they were not there. /Juha-Pekka -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Initial-ICS-Android-support-for-Waffle.patch Type: text/x-patch Size: 52824 bytes Desc: not available URL: From chad.versace at linux.intel.com Tue Jul 31 08:50:27 2012 From: chad.versace at linux.intel.com (Chad Versace) Date: Tue, 31 Jul 2012 08:50:27 -0700 Subject: [waffle] [PATCH] glx: fix attrib list end token In-Reply-To: <1343678473-14351-1-git-send-email-jordan.l.justen@intel.com> References: <1343678473-14351-1-git-send-email-jordan.l.justen@intel.com> Message-ID: <5017FEC3.1030606@linux.intel.com> On 07/30/2012 01:01 PM, Jordan Justen wrote: > It seems this list should be terminated by 0 rather than GLX_NONE. > > http://www.opengl.org/registry/specs/ARB/glx_create_context.txt > " specifies a list of attributes for the context. > The list consists of a sequence of pairs > terminated by the value None (0)." > > Signed-off-by: Jordan Justen Thanks, pushed. ---- Chad Versace chad.versace at linux.intel.com From chad.versace at linux.intel.com Tue Jul 31 08:58:55 2012 From: chad.versace at linux.intel.com (Chad Versace) Date: Tue, 31 Jul 2012 08:58:55 -0700 Subject: [waffle] [PATCH] linux_dl: Use libGL.so.1 for WAFFLE_DL_OPENGL In-Reply-To: <1343697039-21535-1-git-send-email-jordan.l.justen@intel.com> References: <1343697039-21535-1-git-send-email-jordan.l.justen@intel.com> Message-ID: <501800BF.2030404@linux.intel.com> On 07/30/2012 06:10 PM, Jordan Justen wrote: > Use libGL.so.1 rather than libGL.so to lock down the > library ABI version. > > Signed-off-by: Jordan Justen Thanks, pushed. ---- Chad Versace chad.versace at linux.intel.com From chad.versace at linux.intel.com Tue Jul 31 09:31:42 2012 From: chad.versace at linux.intel.com (Chad Versace) Date: Tue, 31 Jul 2012 09:31:42 -0700 Subject: [waffle] waffle 0.3 branch created Message-ID: <5018086E.9010800@linux.intel.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 If you build piglit with waffle, then please begin using waffle's 0.3 branch. That branch has a stable API and receives bug fixes. The master branch currently has an unstable API and Piglit fails to build against it. - -Chad -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJQGAhpAAoJEAIvNt057x8iY/IP/0dKUZmDQEcA7lnW59E7ghGV w9v/Sp8+h1Oct/EiSWCQAHq40qk4zGJF/9fAn/w33c+GBaYpI/tVYKDfsVJ8bNjy I805YRPsIApSjp9v09s/BoBb2GfMbHUK8SikjC/eOV42F4WzUvMZUpTd2tFm3iL8 Icl1yDARsinQ8QhSQkATd7a6A7d4UH4o9E0z5k1DQXiZPjeKGtKDL1312rkso0d+ FQB2HjFv7aMCZHgnYFoWZ/Y9hCYk5FPwD9GxDiJAimCiKPK/vkR9FbTo5F6D1fXk ho4Hd1bfs85jsEwgTz+dt5XQO78zvJ3CTsFhL8yQfdM/P2PjPWp/9FKF2HEVpEUX X9PEThQntwujJehCkCrz8/GRkhvAO9ooiZlbm/A/gIhT2Us+JoKKpg8pFiJSlOyJ iTrwvvj0jQHJLtiEyQRU1rav8QIbeQ7DOga+3TWFbfkQXrVtC/Nbe68TOYEyAiqc sgLUQNeP3K3C175Dotc8d9r0TXOGeW4YwqWDmm0dDZkyFYAi9sU3uqiJkPiqOkUw Cg0DCvGSk+LwjGD3iWsNJuVssH50/y1kc1lqGrNmNwiTW/zblk7z75+VSdoSUFDJ Xz3f38Ftez5g/iuQ7g2BoJCD4y+yZ/b+H8ubNoO9A9DIxkQzrKZ7r/E6SlxZETHY Xsg+eWd8KGiO054FHdWk =fzbF -----END PGP SIGNATURE-----