Diff
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (208039 => 208040)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-10-28 07:08:32 UTC (rev 208040)
@@ -37,7 +37,6 @@
src/libGLESv2/entry_points_gles_2_0.cpp
src/libGLESv2/entry_points_gles_2_0_ext.cpp
src/libGLESv2/entry_points_gles_3_0.cpp
- src/libGLESv2/entry_points_gles_3_0_ext.cpp
src/libGLESv2/entry_points_gles_3_1.cpp
src/libGLESv2/global_state.cpp
src/libGLESv2/libGLESv2.cpp
@@ -90,10 +89,6 @@
src/compiler/translator/Compiler.cpp
src/compiler/translator/ConstantUnion.cpp
src/compiler/translator/DeferGlobalInitializers.cpp
- src/compiler/translator/depgraph/DependencyGraph.cpp
- src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
- src/compiler/translator/depgraph/DependencyGraphOutput.cpp
- src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
src/compiler/translator/Diagnostics.cpp
src/compiler/translator/DirectiveHandler.cpp
src/compiler/translator/EmulateGLFragColorBroadcast.cpp
@@ -147,8 +142,6 @@
src/compiler/translator/StructureHLSL.cpp
src/compiler/translator/SymbolTable.cpp
src/compiler/translator/TextureFunctionHLSL.cpp
- src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
- src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
src/compiler/translator/TranslatorESSL.cpp
src/compiler/translator/TranslatorGLSL.cpp
src/compiler/translator/TranslatorHLSL.cpp
@@ -180,17 +173,13 @@
src/libANGLE/Config.cpp
src/libANGLE/Context.cpp
src/libANGLE/ContextState.cpp
- src/libANGLE/Data.cpp
src/libANGLE/Debug.cpp
src/libANGLE/Device.cpp
src/libANGLE/Display.cpp
src/libANGLE/Error.cpp
src/libANGLE/Fence.cpp
- src/libANGLE/Float16ToFloat32.cpp
src/libANGLE/format_map_autogen.cpp
- src/libANGLE/format_map_autogen.cpp
src/libANGLE/formatutils.cpp
- src/libANGLE/formatutils.cpp
src/libANGLE/Framebuffer.cpp
src/libANGLE/FramebufferAttachment.cpp
src/libANGLE/HandleAllocator.cpp
@@ -208,7 +197,6 @@
src/libANGLE/renderer/ContextImpl.cpp
src/libANGLE/renderer/d3d/BufferD3D.cpp
src/libANGLE/renderer/d3d/CompilerD3D.cpp
- src/libANGLE/renderer/d3d/copyimage.cpp
src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -222,7 +210,6 @@
src/libANGLE/renderer/d3d/d3d11/Image11.cpp
src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
- src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
src/libANGLE/renderer/d3d/d3d11/Query11.cpp
src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -231,18 +218,15 @@
src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
- src/libANGLE/renderer/d3d/d3d11/Stream11.cpp
src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
- src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
- src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
@@ -249,7 +233,6 @@
src/libANGLE/renderer/d3d/d3d9/Context9.cpp
src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
- src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
src/libANGLE/renderer/d3d/d3d9/Image9.cpp
src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
@@ -274,9 +257,6 @@
src/libANGLE/renderer/d3d/ImageD3D.cpp
src/libANGLE/renderer/d3d/IndexBuffer.cpp
src/libANGLE/renderer/d3d/IndexDataManager.cpp
- src/libANGLE/renderer/d3d/loadimage_etc.cpp
- src/libANGLE/renderer/d3d/loadimage.cpp
- src/libANGLE/renderer/d3d/loadimageSSE2.cpp
src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
src/libANGLE/renderer/d3d/ProgramD3D.cpp
src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
@@ -286,7 +266,6 @@
src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
src/libANGLE/renderer/d3d/SurfaceD3D.cpp
src/libANGLE/renderer/d3d/TextureD3D.cpp
- src/libANGLE/renderer/d3d/TransformFeedbackD3D.cpp
src/libANGLE/renderer/d3d/VaryingPacking.cpp
src/libANGLE/renderer/d3d/VertexBuffer.cpp
src/libANGLE/renderer/d3d/VertexDataManager.cpp
@@ -296,7 +275,6 @@
src/libANGLE/renderer/Format.cpp
src/libANGLE/renderer/load_functions_table_autogen.cpp
src/libANGLE/renderer/renderer_utils.cpp
- src/libANGLE/renderer/Renderer.cpp
src/libANGLE/renderer/SurfaceImpl.cpp
src/libANGLE/renderer/TextureImpl.cpp
src/libANGLE/ResourceManager.cpp
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (208039 => 208040)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-10-28 07:08:32 UTC (rev 208040)
@@ -1,3 +1,10 @@
+2016-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows WebGL build after r208036
+ https://bugs.webkit.org/show_bug.cgi?id=164101
+
+ * CMakeLists.txt:
+
2016-10-27 Alex Christensen <achristen...@webkit.org>
Fix Windows WebGL build after r208036
Modified: trunk/Source/WebCore/ChangeLog (208039 => 208040)
--- trunk/Source/WebCore/ChangeLog 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 07:08:32 UTC (rev 208040)
@@ -1,3 +1,15 @@
+2016-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows WebGL build after r208022
+ https://bugs.webkit.org/show_bug.cgi?id=164091
+
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+ * platform/graphics/opengl/Extensions3DOpenGLES.cpp:
+ (WebCore::Extensions3DOpenGLES::Extensions3DOpenGLES):
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+ (WebCore::GraphicsContext3D::getExtensions):
+
2016-10-27 Youenn Fablet <you...@apple.com>
[Fetch API] Fetch ReadableStream should only clone the second branch
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h (208039 => 208040)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2016-10-28 07:08:32 UTC (rev 208040)
@@ -24,8 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Extensions3DOpenGLCommon_h
-#define Extensions3DOpenGLCommon_h
+#pragma once
#include "Extensions3D.h"
@@ -96,5 +95,3 @@
};
} // namespace WebCore
-
-#endif // Extensions3DOpenGLCommon_h
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (208039 => 208040)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp 2016-10-28 07:08:32 UTC (rev 208040)
@@ -37,8 +37,8 @@
namespace WebCore {
-Extensions3DOpenGLES::Extensions3DOpenGLES(GraphicsContext3D* context)
- : Extensions3DOpenGLCommon(context)
+Extensions3DOpenGLES::Extensions3DOpenGLES(GraphicsContext3D* context, bool useIndexedGetString)
+ : Extensions3DOpenGLCommon(context, useIndexedGetString)
, m_contextResetStatus(GL_NO_ERROR)
, m_supportsOESvertexArrayObject(false)
, m_supportsIMGMultisampledRenderToTexture(false)
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (208039 => 208040)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2016-10-28 07:08:32 UTC (rev 208040)
@@ -24,8 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Extensions3DOpenGLES_h
-#define Extensions3DOpenGLES_h
+#pragma once
#include "Extensions3DOpenGLCommon.h"
@@ -64,7 +63,7 @@
class Extensions3DOpenGLES : public Extensions3DOpenGLCommon {
public:
// This class only needs to be instantiated by GraphicsContext3D implementations.
- explicit Extensions3DOpenGLES(GraphicsContext3D*);
+ explicit Extensions3DOpenGLES(GraphicsContext3D*, bool useIndexedGetString);
virtual ~Extensions3DOpenGLES();
virtual void framebufferTexture2DMultisampleIMG(unsigned long target, unsigned long attachment, unsigned long textarget, unsigned int texture, int level, unsigned long samples);
@@ -126,5 +125,3 @@
} // namespace WebCore
#endif // USE(OPENGL_ES_2)
-
-#endif // Extensions3DOpenGLES_h
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (208039 => 208040)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-10-28 06:27:29 UTC (rev 208039)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-10-28 07:08:32 UTC (rev 208040)
@@ -244,7 +244,7 @@
Extensions3D* GraphicsContext3D::getExtensions()
{
if (!m_extensions)
- m_extensions = std::make_unique<Extensions3DOpenGLES>(this);
+ m_extensions = std::make_unique<Extensions3DOpenGLES>(this, isGLES2Compliant());
return m_extensions.get();
}
