Hi Milian, I would upstream the patches to ANGLE and then update the ANGLE revision in WebKit. If the changes are small, you could upstream them to ANGLE first and then land them directly in WebKit's copy of ANGLE. Periodically, we update the ANGLE revision in WebKit with the latest ANGLE sources, which would blow away any changes that have not been upstreamed to ANGLE.
The ANGLE guys are easy to work to with, so I would post a patch on their review system and have a chat with them about your changes. Here's a the wiki page for contributing to ANGLE: http://code.google.com/p/angleproject/wiki/ContributingCode - Max On Aug 31, 2012, at 6:02 AM, Milian Wolff <[email protected]<mailto:[email protected]>> wrote: Hey there, the last days I've spent on trying to get a QtWebKit with OpenGL support, see https://bugs.webkit.org/show_bug.cgi?id=95466 for an assortment of patches. To get it compiling, I had to patch ANGLE source code and Simon Hausmann told me he is not comfortable in reviewing these patches. So here I am asking for how to proceed. Should I first try to upstream these patches to ANGLE somehow? This one should be fairly trivial to get upstream I hope: https://bugs.webkit.org/show_bug.cgi?id=95468 I severly doubt that this will be possible for the following patch though: https://bugs.webkit.org/show_bug.cgi?id=95560 How do other platforms manage this? I.e. how do you guys compile the ANGLE code on an OS with OpenGL ES but without X11? I fail to see how this is possible, i.e. how should #include "GLSLANG/ShaderLang.h" be found but the system includes used instead of ANGLE/include/{EGL,GLES2,KHR}? Esp. the Blackberry guys should have had the same issue, or is OpenGL / USE_3D_GRAPHICS disabled on that platform? One idea I have would be to move the GLSLANG folder to a different place, maybe inside ANGLE/src such that it can be included without requiring ANGLE/include to reside in the include path? Cheers -- Milian Wolff | [email protected] | Software Engineer KDAB (Deutschland) GmbH&Co KG, a KDAB Group company Tel. Germany +49-30-521325470, Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-independent software solutions <signature.asc>_______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-dev
_______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-dev
