Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (245088 => 245089)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-05-09 04:15:46 UTC (rev 245088)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-05-09 04:30:32 UTC (rev 245089)
@@ -1,3 +1,13 @@
+2019-05-08 Alex Christensen <[email protected]>
+
+ Fix High Sierra build.
+
+ * src/libANGLE/State.cpp:
+ (gl::State::kBufferSetters):
+ * src/libANGLE/State.h:
+ (gl::State::setBufferBinding):
+ Remove the need for a global constructor.
+
2019-05-08 Don Olmstead <[email protected]>
Update ANGLE
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp (245088 => 245089)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp 2019-05-09 04:15:46 UTC (rev 245088)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp 2019-05-09 04:30:32 UTC (rev 245089)
@@ -216,20 +216,24 @@
mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
}
-const angle::PackedEnumMap<BufferBinding, State::BufferBindingSetter> State::kBufferSetters = {{
- GetBufferBindingSetter<BufferBinding::Array>(),
- GetBufferBindingSetter<BufferBinding::AtomicCounter>(),
- GetBufferBindingSetter<BufferBinding::CopyRead>(),
- GetBufferBindingSetter<BufferBinding::CopyWrite>(),
- GetBufferBindingSetter<BufferBinding::DispatchIndirect>(),
- GetBufferBindingSetter<BufferBinding::DrawIndirect>(),
- GetBufferBindingSetter<BufferBinding::ElementArray>(),
- GetBufferBindingSetter<BufferBinding::PixelPack>(),
- GetBufferBindingSetter<BufferBinding::PixelUnpack>(),
- GetBufferBindingSetter<BufferBinding::ShaderStorage>(),
- GetBufferBindingSetter<BufferBinding::TransformFeedback>(),
- GetBufferBindingSetter<BufferBinding::Uniform>(),
-}};
+const angle::PackedEnumMap<BufferBinding, State::BufferBindingSetter>& State::kBufferSetters()
+{
+ static const angle::PackedEnumMap<BufferBinding, State::BufferBindingSetter> setters {{
+ GetBufferBindingSetter<BufferBinding::Array>(),
+ GetBufferBindingSetter<BufferBinding::AtomicCounter>(),
+ GetBufferBindingSetter<BufferBinding::CopyRead>(),
+ GetBufferBindingSetter<BufferBinding::CopyWrite>(),
+ GetBufferBindingSetter<BufferBinding::DispatchIndirect>(),
+ GetBufferBindingSetter<BufferBinding::DrawIndirect>(),
+ GetBufferBindingSetter<BufferBinding::ElementArray>(),
+ GetBufferBindingSetter<BufferBinding::PixelPack>(),
+ GetBufferBindingSetter<BufferBinding::PixelUnpack>(),
+ GetBufferBindingSetter<BufferBinding::ShaderStorage>(),
+ GetBufferBindingSetter<BufferBinding::TransformFeedback>(),
+ GetBufferBindingSetter<BufferBinding::Uniform>(),
+ }};
+ return setters;
+}
State::State(ContextID contextIn,
const State *shareContextState,
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.h (245088 => 245089)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.h 2019-05-09 04:15:46 UTC (rev 245088)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/State.h 2019-05-09 04:30:32 UTC (rev 245089)
@@ -318,7 +318,7 @@
//// Typed buffer binding point manipulation ////
ANGLE_INLINE void setBufferBinding(const Context *context, BufferBinding target, Buffer *buffer)
{
- (this->*(kBufferSetters[target]))(context, buffer);
+ (this->*(kBufferSetters()[target]))(context, buffer);
}
ANGLE_INLINE Buffer *getTargetBuffer(BufferBinding target) const
@@ -693,7 +693,7 @@
static_assert(DIRTY_OBJECT_MAX == 9, "check DIRTY_OBJECT_MAX");
// Dispatch table for buffer update functions.
- static const angle::PackedEnumMap<BufferBinding, BufferBindingSetter> kBufferSetters;
+ static const angle::PackedEnumMap<BufferBinding, BufferBindingSetter>& kBufferSetters();
Version mClientVersion;
ContextID mContext;
Modified: trunk/Source/WebCore/ChangeLog (245088 => 245089)
--- trunk/Source/WebCore/ChangeLog 2019-05-09 04:15:46 UTC (rev 245088)
+++ trunk/Source/WebCore/ChangeLog 2019-05-09 04:30:32 UTC (rev 245089)
@@ -1,3 +1,10 @@
+2019-05-08 Alex Christensen <[email protected]>
+
+ Try to fix Linux build
+
+ * platform/graphics/ANGLEWebKitBridge.h:
+ Include headers consistently on all platforms.
+
2019-05-08 Don Olmstead <[email protected]>
Update ANGLE
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (245088 => 245089)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2019-05-09 04:15:46 UTC (rev 245088)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2019-05-09 04:30:32 UTC (rev 245089)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ANGLEWebKitBridge_h
-#define ANGLEWebKitBridge_h
+#pragma once
#if USE(LIBEPOXY)
// libepoxy headers have to be included before <ANGLE/ShaderLang.h> in order to avoid
@@ -32,11 +31,7 @@
#include <epoxy/gl.h>
#endif
-#if PLATFORM(COCOA)
#include <ANGLE/ShaderLang.h>
-#else
-#include <ANGLE/GLSLANG/ShaderLang.h>
-#endif
#include <wtf/text/WTFString.h>
#if PLATFORM(COCOA)
@@ -100,5 +95,3 @@
};
} // namespace WebCore
-
-#endif
