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

hwdec_d3d11egl: EGL_EXT_device_query is client extension #11142

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

hwdec_d3d11egl: EGL_EXT_device_query is client extension #11142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion video/out/opengl/hwdec_d3d11egl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ static int init(struct ra_hwdec *hw)

GL *gl = ra_gl_get(hw->ra);

const char *client_exts = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
const char *exts = eglQueryString(egl_display, EGL_EXTENSIONS);
if (!gl_check_extension(exts, "EGL_ANGLE_d3d_share_handle_client_buffer") ||
!gl_check_extension(exts, "EGL_ANGLE_stream_producer_d3d_texture") ||
!(gl_check_extension(gl->extensions, "GL_OES_EGL_image_external_essl3") ||
gl->es == 200) ||
!gl_check_extension(exts, "EGL_EXT_device_query") ||
!(gl_check_extension(client_exts, "EGL_EXT_device_query") ||
gl_check_extension(exts, "EGL_EXT_device_query")) ||
Copy link
Member

Choose a reason for hiding this comment

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

if its a client extension why keep the second check?

Copy link
Member

@jeeb jeeb Jan 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

If I understand the comments in #10212 correctly, before November 2020 ANGLE exposed this in the old location, while current binaries like the one I just tested this with (https://github.com/google/gfbuild-angle/releases/tag/github%2Fgoogle%2Fgfbuild-angle%2Ff810e998993290f049bbdad4fae975e4867100ad) expose it in the new location.

This PR seems to attempt to support both ages of libraries.

edit: My slight personal opinion is that since it's already been two years and the new location seems to be the technically correct one, we might as well switch to supporting the new version only at this point?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

supporting old version is trivial work. some users may use outdated angle provided by framework(eg. qt?)

Copy link
Member

Choose a reason for hiding this comment

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

This seems to have gotten completely lost but given that's been yet another two years, I think only supporting the new location at this point is the way to go.

!(gl->mpgl_caps & MPGL_CAP_TEX_RG))
return -1;

Expand Down