Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[angle] Update to the latest commit. #7329

Merged
merged 12 commits into from
Sep 29, 2019
Prev Previous commit
Next Next commit
Fix build linux.
  • Loading branch information
NancyLi1013 committed Jul 19, 2019
commit b17d93e44a577c33941acd504c65fb76fec39064
26 changes: 26 additions & 0 deletions ports/angle/002-fix-linux.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
index bdf8c2a..6e0daac 100644
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -1254,7 +1254,7 @@ inline constexpr unsigned int UnsignedCeilDivide(unsigned int value, unsigned in
return (divided + ((value % divisor == 0) ? 0 : 1));
}

-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__GNUC__)

# define ANGLE_ROTL(x, y) _rotl(x, y)
# define ANGLE_ROTL64(x, y) _rotl64(x, y)
diff --git a/src/libGLESv2/proc_table_autogen.cpp b/src/libGLESv2/proc_table_autogen.cpp
index a57622e..82944b8 100644
--- a/src/libGLESv2/proc_table_autogen.cpp
+++ b/src/libGLESv2/proc_table_autogen.cpp
@@ -10,7 +10,7 @@
// Mapping from a string entry point name to function address.
//

-#include "libGLESv2/proc_table.h"
+#include "libGLESv2/proc_table_egl.h"

#include "libGLESv2/entry_points_egl.h"
#include "libGLESv2/entry_points_egl_ext.h"
1 change: 1 addition & 0 deletions ports/angle/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ vcpkg_from_github(
SHA512 6e71bd916781751e1f2f1850007d312ed917b11eda2fef6767bc4e61d1740825e2cf4ee4ac2477c93f7df4bd13b32dbfe7014d11a474333d20f0e1a2a99f80c6
PATCHES
001-fix-uwp.patch
002-fix-linux.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand Down