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.

Sign up for GitHub

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

Jump to bottom

add support for GLES on Windows over angle #16

Merged
merged 5 commits into from
Aug 31, 2019
Merged

add support for GLES on Windows over angle #16

merged 5 commits into from
Aug 31, 2019

Conversation

AlwinEsch
Copy link
Member

@AlwinEsch AlwinEsch commented Mar 3, 2019 •
edited
Loading

This changes allow the addon to use on windows and all other OS's
without add of different code.

The request can not enter now. But already created to have an example, where it is needed.

For this to work, the following changes must be included in Kodi:

Request Why
xbmc/xbmc#15609 To bring OS independent support for Time
xbmc/xbmc#15610 To bring the required Angle support on addon
xbmc/xbmc#15642 To have on CMake the right APP_RENDER_SYSTEM value set

After Kodi himself has these changes, this request could also come in.

Here a test Picture:
juhu-picture2

Here is a minimal addon, where support this way https://github.com/AlwinEsch/screensaver.example.windows.gles (Maybe good to have better overview)

@AlwinEsch AlwinEsch mentioned this pull request Mar 3, 2019
Closed
Rechi
Rechi reviewed Mar 3, 2019
View reviewed changes
FindOpenGLES.cmake
find_package(kodi-angle REQUIRED)
set(OPENGLES_LIBRARIES kodi::angle::libGLESv2
kodi::angle::libEGL)
set(OPENGLES_FOUND ${kodi-angle_FOUND})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong, use find_package_handle_standard_args.

Copy link
Member Author

@AlwinEsch AlwinEsch Mar 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you an example, has tried now and also on begin and not becomed it working with find_package_handle_standard_args?

@afedchin
Copy link
Member

afedchin commented Mar 3, 2019

current CMakeLists.txt for angle is wrong, build will fail for uwp

@AlwinEsch
Copy link
Member Author

@afedchin have you a log?

@afedchin
Copy link
Member

afedchin commented Mar 3, 2019 •
edited
Loading

I haven't the log, but I'm sure win32 sources shouldn't be included in uwp build.

libangle_d3d11_win32_sources = [
  "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp",
  "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h",
  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp",
  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h",
  "src/third_party/systeminfo/SystemInfo.cpp",
  "src/third_party/systeminfo/SystemInfo.h",
]

CompositorNativeWindow11 definitely contains undefined symbols on uwp

@AlwinEsch
Copy link
Member Author

Is updated and now works also on Kodi for WindowsStore

@AlwinEsch AlwinEsch force-pushed the add-windows branch 3 times, most recently from 239eaf1 to 94a572e Compare March 5, 2019 21:06
@AlwinEsch
Copy link
Member Author

Angles CMakeLists.txt is updated and cleaned up.

Furthermore, I tested it under Linux and ran there after a few changes. The addon in GLES with angle forced and operated with Kodi.

About set to enable or disable d3d11 usage. Unfortunately it is not possible without code changes in angle since he uses a d3d11 header in a global part.

@afedchin
Copy link
Member

afedchin commented Mar 6, 2019

About set to enable or disable d3d11 usage. Unfortunately it is not possible without code changes in angle since he uses a d3d11 header in a global part.

it's an issue of angle itself otherwise why for introduce ANGLE_ENABLE_D3D11 definition? and the issue is not a reason to introduce wrong behavior.

@AlwinEsch AlwinEsch changed the base branch from master to Matrix August 30, 2019 15:32
@AlwinEsch AlwinEsch force-pushed the add-windows branch 3 times, most recently from 2c03a2d to 33d9372 Compare August 30, 2019 16:36
@AlwinEsch
add AppVeyor
5cce024
@AlwinEsch
fix query_cubemap_capability() on iOS where returns *_NONE
aaa005f 
It report not supported "GL_EXT_texture_cube_map" and not supported
"GL_EXT_texture_cube_map_array". But by test the addon worked
normal with this check prevented.
@AlwinEsch
allow Jenkins for all OS
b46badf
@AlwinEsch
increase version to 2.4.0
ad2cb3d
@AlwinEsch AlwinEsch merged commit 02908ae into xbmc:Matrix Aug 31, 2019
@AlwinEsch AlwinEsch deleted the add-windows branch August 31, 2019 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afedchin afedchin afedchin left review comments

@Rechi Rechi Rechi left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@AlwinEsch @afedchin @Rechi