Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

EGL #11982

Merged
merged 6 commits into from
Sep 14, 2023
Merged

EGL #11982

merged 6 commits into from
Sep 14, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Sep 14, 2023

This brings back the GLES support required for Windows drivers that are ignored by QT and on Single PCB devices like Raspberry PI.

The spinnies are still black. #11930

Fixes #11641

@daschuer daschuer changed the base branch from main to 2.4 September 14, 2023 11:04
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

Thank you. I'll do a manual test soon. also, iiuc this has nothing to do with EGL and is only concerning GL ES support/compatibility...

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

No regressions on fedora as far as I can tell. LGTM

@Swiftb0y Swiftb0y merged commit 860ff09 into mixxxdj:2.4 Sep 14, 2023
@daschuer
Copy link
Member Author

Thank you.

@JoergAtGithub
Copy link
Member

I just build 2.4 and now Mixxx does no longer start up under Windows 11, when started from install directory of x64_legacy with $env:QT_OPENGL = 'angle'

warning [Main] QWindowsEGLContext: Failed to create context, eglError: 3004, this: 0x25b91296890
warning [Main] QOpenGLWindow::beginPaint: Failed to create context
warning [Main] QOpenGLWindow::beginPaint: Failed to make context current

With $env:QT_OPENGL = 'desktop' or $env:QT_OPENGL = 'software' everything works still fine using the AMD OpenGL driver.

@Swiftb0y
Copy link
Member

Have you considered removing the QSurfaceFormat::setProfile call? The qt docs say that it'll be ignored when not supported but maybe that's broken?

@JoergAtGithub
Copy link
Member

It seem my previous test result was not correct. I cleaned the install directory and installed again, and now get:

debug [Main] OpenGL driver version string "OpenGL ES 3.0.0 (ANGLE 2.1.5414 git hash: aa63ea230e0c)", vendor "Google Inc. (AMD)", renderer "ANGLE (AMD, AMD Radeon(TM) Graphics Direct3D11 vs_5_0 ps_5_0, D3D11-31.0.12044.50003)"
debug [Main] Supported OpenGL version: 3.0

but later it fails with:

warning [Main] QOpenGLShader::compile(Fragment): ERROR: 0:7: '0.75f' : Floating-point suffix unsupported prior to GLSL ES 3.00
ERROR: 0:7: '0.75f' : syntax error

warning [Main] *** Problematic Fragment shader source code ***
#ifdef GL_KHR_blend_equation_advanced
#extension GL_ARB_fragment_coord_conventions : enable
#extension GL_KHR_blend_equation_advanced : enable
#endif
#line 1

uniform sampler2D sampler;
uniform highp vec4 color;
varying highp vec3 vTexcoor;
void main()
{
    gl_FragColor = vec4(color.xyz, texture2D(sampler, vTexcoor.xy) * 0.75f);
}

***
DEBUG ASSERT: "addShaderFromSourceCode( GLShader::Fragment, fragmentShaderCode)" in function void __cdecl mixxx::Shader::load(const class QString &,const class QString &) at C:\Users\Joerg.WORLDWARTWEB\source\repos\JoergAtGithub\mixxx\src\shaders\shader.cpp:24

@Swiftb0y
Copy link
Member

right, thats a clearer error now at least. Can you fix the shaders locally and try again?

Sign up for free to 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.4 doesn't start with QT_OPENGL=angle on Windows
3 participants