Since the 2.2 release has branched, now is the time to enable TextureMapper and find the remaining issues with it.
Created attachment 95357 [details] Patch This has been discussed in the mailing list. It might have some effects on tests with platforms I can't test manually, so I'll get it through the commit queue once reviewed.
Comment on attachment 95357 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95357&action=review r=me, let's rock the boat! > Source/WebCore/WebCore.pri:6 > +# Comment this to disable Texture Mapper. This comment feels a little awkward.
Created attachment 95362 [details] Patch with a less awkward comment.
Comment on attachment 95362 [details] Patch with a less awkward comment. Clearing flags on attachment: 95362 Committed r87697: <http://trac.webkit.org/changeset/87697>
All reviewed patches have been landed. Closing bug.
It broke Qt Windows build. Could you fix it ASAP? It seems that OpenGL support is missing from the Qt on Windows bot. Andras, could you check it? If it is true, some ifdef guards are missing from the patch.
Fixed in r87700
Symbian build is still broken. I have no idea why.
(In reply to comment #8) > Symbian build is still broken. I have no idea why. Looks like a problem with the OpenGL headers: compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) ^ Should we build without OpenGL on Symbian perhaps?
(In reply to comment #9) > (In reply to comment #8) > > Symbian build is still broken. I have no idea why. > > Looks like a problem with the OpenGL headers: > > compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] > "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined > GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) > ^ > > Should we build without OpenGL on Symbian perhaps? This shouldn't even be built on symbian, unless unix|mac applies to Symbian somehow. For now we should not enable TextureMapper for symbian, and eventually not build the OpenGL backend for Symbian.
(In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > Symbian build is still broken. I have no idea why. > > > > Looks like a problem with the OpenGL headers: > > > > compile : Source\WebCore\platform\graphics\opengl\TextureMapperGL.cpp [armv5_urel.rvct4_0] > > "D:/w/qt-symbian-release/build/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp", line 532: Error: #20: identifier "GL_BGRA" is undefined > > GL_CMD(glTexSubImage2D(GL_TEXTURE_2D, 0, m_dirtyRect.x(), m_dirtyRect.y(), m_dirtyRect.width(), m_dirtyRect.height(), GL_BGRA, GL_UNSIGNED_BYTE, m_buffer->data())) > > ^ > > > > Should we build without OpenGL on Symbian perhaps? > > This shouldn't even be built on symbian, unless unix|mac applies to Symbian somehow. > For now we should not enable TextureMapper for symbian, and eventually not build the OpenGL backend for Symbian. Actually qmake considers Symbian to be a flavor of unix. To exclude the texmap flag for Symbian you'll need to guard it with a 'mac|unix:!symbian' scope.
Should be fixed in r87739
Created attachment 96298 [details] Patch
Reopening, so we can enable non-GL texture-mapper for Win/Symbian
Comment on attachment 96298 [details] Patch rs=me
Comment on attachment 96298 [details] Patch Clearing flags on attachment: 96298 Committed r88304: <http://trac.webkit.org/changeset/88304>