fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(linux): initialize EGL via GLAD correctly - #4852

Merged
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix
Mar 15, 2026
Merged

fix(linux): initialize EGL via GLAD correctly#4852
ReenigneArcher merged 1 commit into
LizardByte:build/linux/generate-glad-sources-at-compile-timefrom
psyke83:glad_init_fix

Conversation

@psyke83

@psyke83psyke83 commented Mar 15, 2026

Copy link
Copy Markdown
Contributor
  • misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
  • graphics.cpp: phase 2 load using correct display configuration with
    eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
  • Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
  • Add missing/required extensions to GLAD makefile based on existing
    extensions queried & new eglGetPlatformDisplayEXT requirement.
  • Remove hardcoded definitions that are part of previously missing
    extensions.

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@psyke83
psyke83 marked this pull request as ready for review March 15, 2026 05:18
@psyke83

Copy link
Copy Markdown
ContributorAuthor

Tested and confirmed working against kmsgrab and portalgrab backends, and creates the EGL context successfully from ssh as well.

It should work on nvidia based on cursory search online, e.g.: https://docs.nvidia.com/drive/drive-os-5.2.0.0L/drive-os/index.html#page/DRIVE_OS_Linux_SDK_Development_Guide/Windows%20Systems/window_system_egl.html

...but it might be a good idea for a nvidia user to test to be sure.

@psyke83
psyke83force-pushed the glad_init_fix branch 3 times, most recently from ab6e286 to 631d64dCompareMarch 15, 2026 05:52
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@sonarqubecloud

Copy link
Copy Markdown

@psyke83

Copy link
Copy Markdown
ContributorAuthor

After looking at the glad sources, another optimization that could be applied that might improve VAAPI encoding (and anything else that relies on EGL; Vulkan doesn't apply). I'll send a separate PR after you've merged this branch, but this is the current version:

diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
index bf8f4b1e..99f9e52b 100644
--- a/cmake/dependencies/glad.cmake
+++ b/cmake/dependencies/glad.cmake
@@ -179,6 +179,7 @@ glad_add_library(glad_egl
EGL_EXT_platform_base
EGL_EXT_platform_wayland
EGL_EXT_platform_x11
+ EGL_IMG_context_priority
EGL_KHR_create_context
EGL_KHR_image_base
EGL_KHR_surfaceless_context
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 38eb0071..522631ad 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -405,20 +405,36 @@ namespace egl {
return std::nullopt;
}
- constexpr int attr[] {
- EGL_CONTEXT_CLIENT_VERSION,
- 3,
- EGL_NONE
- };
+ const char *extension_st = eglQueryString(display, EGL_EXTENSIONS);
+
+ std::vector<EGLint> attr;
+ attr.push_back(EGL_CONTEXT_CLIENT_VERSION);
+ attr.push_back(3);
+
+ // Only add the priority attribute if the driver explicitly supports it
+ if (extension_st && std::strstr(extension_st, "EGL_IMG_context_priority")) {
+ BOOST_LOG(debug) << "EGL: High priority context supported"sv;
+ attr.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
+ attr.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
+ }
+ attr.push_back(EGL_NONE);
- ctx_t ctx {display, eglCreateContext(display, conf, EGL_NO_CONTEXT, attr)};
- if (fail()) {
+ EGLContext raw_ctx = eglCreateContext(display, conf, EGL_NO_CONTEXT, attr.data());
+ if (raw_ctx == EGL_NO_CONTEXT) {
BOOST_LOG(error) << "Couldn't create EGL context: ["sv << util::hex(eglGetError()).to_string_view() << ']';
return std::nullopt;
}
- TUPLE_EL_REF(ctx_p, 1, ctx.el);
- if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, ctx_p)) {
+ ctx_t ctx {display, raw_ctx};
+
+ EGLint actual_priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+ if (eglQueryContext(display, raw_ctx, EGL_CONTEXT_PRIORITY_LEVEL_IMG, &actual_priority)) {
+ if (actual_priority == EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+ BOOST_LOG(info) << "EGL Context Priority: HIGH"sv;
+ }
+ }
+
+ if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, raw_ctx)) {
BOOST_LOG(error) << "Couldn't make current display"sv;
return std::nullopt;
}

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Bundle Report

Bundle size has no change ✅

@codecov

codecovBot commented Mar 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.51%. Comparing base (597a241) to head (c7f7042).

Files with missing linesPatch %Lines
src/platform/linux/graphics.cpp0.00%12 Missing ⚠️
src/platform/linux/misc.cpp0.00%1 Missing and 2 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## build/linux/generate-glad-sources-at-compile-time #4852 +/- ##
=====================================================================================
- Coverage 17.52% 17.51% -0.02% 
=====================================================================================
Files 106 106 Lines 21850 21856 +6 Branches 9751 9756 +5 =====================================================================================
- Hits 3829 3827 -2 + Misses 16110 14962 -1148 - Partials 1911 3067 +1156 
FlagCoverage Δ
Archlinux12.00% <0.00%> (-0.01%)⬇️
FreeBSD-14.3-amd6413.81% <0.00%> (-0.02%)⬇️
Homebrew-ubuntu-22.0414.30% <0.00%> (-0.01%)⬇️
Linux-AppImage12.45% <0.00%> (-0.01%)⬇️
Windows-AMD6414.49% <ø> (ø)
Windows-ARM6413.11% <ø> (ø)
macOS-arm6418.22% <ø> (ø)
macOS-x86_6416.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing linesCoverage Δ
src/platform/linux/misc.cpp15.28% <0.00%> (-0.38%)⬇️
src/platform/linux/graphics.cpp2.38% <0.00%> (-0.03%)⬇️

... and 45 files with indirect coverage changes

@ReenigneArcher
ReenigneArcher merged commit e74ea2e into LizardByte:build/linux/generate-glad-sources-at-compile-timeMar 15, 2026
60 of 64 checks passed
ReenigneArcher pushed a commit that referenced this pull request Mar 15, 2026
* misc.cpp: phase 1 load (symbols only, defaults to EGL 1.0).
* graphics.cpp: phase 2 load using correct display configuration with
eglGetPlatformDisplayEXT (initializes proper EGL version dispatch).
* Retain eglGetPlatformDisplay fallback if proprietary drivers need it.
* Add missing/required extensions to GLAD makefile based on existing
extensions queried & new eglGetPlatformDisplayEXT requirement.
* Remove hardcoded definitions that are part of previously missing
extensions.
@psyke83
psyke83 deleted the glad_init_fix branch March 16, 2026 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@psyke83@ReenigneArcher