Attachment 369365 Details for Bug 197676 – WPE fixes

[patch] WPE fixes

angle.diff (text/plain), 3.05 KB, created by Zan Dobersek on 2019-05-08 01:52:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2019-05-08 01:52:21 PDT

Size: 3.05 KB

patch

obsolete

>diff --git a/Source/ThirdParty/ANGLE/include/CMakeLists.txt b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>index 7249db38444..8ebf51fe453 100644
>--- a/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>+++ b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>@@ -49,11 +49,11 @@ if (USE_ANGLE_EGL)
>         ${gles3_headers}
>         ${khr_headers}
>     )
>-elseif (NOT USE_EGL)
>+else ()
>     list(APPEND ANGLE_PUBLIC_HEADERS ${khr_headers})
> endif ()
> 
> WEBKIT_COPY_FILES(ANGLEHeaders
>-    DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}
>+    DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE
>     FILES ${ANGLE_PUBLIC_HEADERS}
> )
>diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>index a7cee1d46d6..0e93efce4c6 100644
>--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>@@ -8,7 +8,7 @@
> 
> #include <stddef.h>
> 
>-#include "khrplatform.h"
>+#include "../KHR/khrplatform.h"
> 
> #include <array>
> #include <map>
>diff --git a/Source/ThirdParty/ANGLE/src/common/debug.h b/Source/ThirdParty/ANGLE/src/common/debug.h
>index 64783687b33..8c57f58be48 100644
>--- a/Source/ThirdParty/ANGLE/src/common/debug.h
>+++ b/Source/ThirdParty/ANGLE/src/common/debug.h
>@@ -248,7 +248,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
> #    define EVENT(message, ...) (void(0))
> #endif
> 
>-#if defined(COMPILER_GCC) || defined(__clang__)
>+#if defined(__GNUC__) || defined(__clang__)
> #    define ANGLE_CRASH() __builtin_trap()
> #else
> #    define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0)
>diff --git a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>index 38235919526..d32173b827e 100644
>--- a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>+++ b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>@@ -32,7 +32,7 @@
> #include <epoxy/gl.h>
> #endif
> 
>-#include <ANGLE/ShaderLang.h>
>+#include <ANGLE/GLSLANG/ShaderLang.h>
> #include <wtf/text/WTFString.h>
> 
> #if PLATFORM(COCOA)
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>index 14d42862bf2..0eb358beca7 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>@@ -40,7 +40,7 @@
> #if PLATFORM(WIN)
> #include <GLSLANG/ShaderLang.h>
> #else
>-#include <ANGLE/ShaderLang.h>
>+#include <ANGLE/GLSLANG/ShaderLang.h>
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>index 652c90fdb01..66dd6d811a0 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>@@ -38,7 +38,7 @@
> #if PLATFORM(WIN)
> #include <GLSLANG/ShaderLang.h>
> #else
>-#include <ANGLE/ShaderLang.h>
>+#include <ANGLE/GLSLANG/ShaderLang.h>
> #endif
> 
> #if USE(LIBEPOXY)

Actions: View | Formatted Diff | Diff

Attachments on bug 197676: 369333 | 369336 | 369351 | 369365 | 369395 | 369406 | 369454 | 369510