Title: [160458] trunk/Source/WebCore
- Revision
- 160458
- Author
- [email protected]
- Date
- 2013-12-11 14:46:47 -0800 (Wed, 11 Dec 2013)
Log Message
[WebGL] Fix build on GL ES 2.0 targets after r160119
https://bugs.webkit.org/show_bug.cgi?id=125541
Patch by Ralph Thomas <[email protected]> on 2013-12-11
Reviewed by Brent Fulgham.
GL ES 2.0 doesn't define GL_HALF_FLOAT_ARB, so pass through HALF_FLOAT_OES (which is defined for GL ES 2.0).
This change also reverts r160324 which incorrectly defined GL_HALF_FLOAT_ARB for the Windows ANGLE target.
No new tests, no change in functionality.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::texSubImage2D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160457 => 160458)
--- trunk/Source/WebCore/ChangeLog 2013-12-11 22:40:23 UTC (rev 160457)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 22:46:47 UTC (rev 160458)
@@ -1,3 +1,18 @@
+2013-12-11 Ralph Thomas <[email protected]>
+
+ [WebGL] Fix build on GL ES 2.0 targets after r160119
+ https://bugs.webkit.org/show_bug.cgi?id=125541
+
+ Reviewed by Brent Fulgham.
+
+ GL ES 2.0 doesn't define GL_HALF_FLOAT_ARB, so pass through HALF_FLOAT_OES (which is defined for GL ES 2.0).
+ This change also reverts r160324 which incorrectly defined GL_HALF_FLOAT_ARB for the Windows ANGLE target.
+
+ No new tests, no change in functionality.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::texSubImage2D):
+
2013-12-11 Joseph Pecoraro <[email protected]>
Web Inspector: Push More Inspector Required Classes Down into _javascript_Core
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (160457 => 160458)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2013-12-11 22:40:23 UTC (rev 160457)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2013-12-11 22:46:47 UTC (rev 160458)
@@ -39,12 +39,6 @@
#define PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC
#endif
-#if PLATFORM(WIN) && USE(OPENGL_ES_2)
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB 0x140B
-#endif
-#endif
-
#ifndef GL_EXT_robustness
/* reuse GL_NO_ERROR */
#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (160457 => 160458)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2013-12-11 22:40:23 UTC (rev 160457)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2013-12-11 22:46:47 UTC (rev 160458)
@@ -1365,8 +1365,10 @@
{
makeContextCurrent();
+#if !USE(OPENGL_ES_2)
if (type == HALF_FLOAT_OES)
type = GL_HALF_FLOAT_ARB;
+#endif
// FIXME: we will need to deal with PixelStore params when dealing with image buffers that differ from the subimage size.
::glTexSubImage2D(target, level, xoff, yoff, width, height, format, type, pixels);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
