Skip to content

Commit

Permalink
[angle] Include EGL/eglext_angle.h in ANGLE (#16733)
Browse files Browse the repository at this point in the history
* Avoid exluding EGL/eglext_angle.h from ANGLE and add egl_loader_autogen.cpp/h that were not properly added.

* Add port version to ANGLE port.

* Ran vcpkg x-add-version --overwrite-version angle.
  • Loading branch information
hanseuljun committed Mar 19, 2021
1 parent 6b1db3e commit a125fe9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
6 changes: 5 additions & 1 deletion ports/angle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ add_library(libEGL
"src/libEGL/libEGL.cpp"
"src/libEGL/libEGL.rc"
"src/libEGL/resource.h"
"src/libEGL/egl_loader_autogen.cpp"
"src/libEGL/egl_loader_autogen.h"
)
target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
Expand Down Expand Up @@ -469,7 +471,9 @@ if(NOT DISABLE_INSTALL_HEADERS)
PATTERN "*.h"
PATTERN "*.inc"
PATTERN "GLSLANG" EXCLUDE
PATTERN "EGL" EXCLUDE
PATTERN "egl.h" EXCLUDE
PATTERN "eglext.h" EXCLUDE
PATTERN "eglplatform.h" EXCLUDE
PATTERN "KHR" EXCLUDE
PATTERN "export.h" EXCLUDE
)
Expand Down
3 changes: 2 additions & 1 deletion ports/angle/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: angle
Version: 2020-05-15-1
Version: 2020-05-15
Port-Version: 2
Homepage: https://github.com/google/angle
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/angle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "48342ccfb3565a61cc9ed878a2ff422e294b4e56",
"version-string": "2020-05-15",
"port-version": 2
},
{
"git-tree": "936af02bc2517e092035c23ca444a3d638b9a713",
"version-string": "2020-05-15-1",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
"port-version": 0
},
"angle": {
"baseline": "2020-05-15-1",
"port-version": 0
"baseline": "2020-05-15",
"port-version": 2
},
"antlr4": {
"baseline": "4.8",
Expand Down

0 comments on commit a125fe9

Please sign in to comment.