hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2025-12-25 11:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

renderer: remove gles2 context creation

Browse source 
we are now using gles3 functions that will not work in a gles2 context,
remove any attempts of using it.
This commit is contained in:
Tom Englund 2025-05-20 14:14:31 +02:00
parent 30087dcda2
commit 0f6e6ddc01
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/backend/drm/Renderer.cpp
View file

@ -374,7 +374,7 @@ void CDRMRenderer::loadEGLAPI() {
RASSERT(eglBindAPI(EGL_OPENGL_ES_API) != EGL_FALSE, "Couldn't bind to EGL's opengl ES API. This means your gpu driver f'd up. This is not a Hyprland or Aquamarine issue."); RASSERT(eglBindAPI(EGL_OPENGL_ES_API) != EGL_FALSE, "Couldn't bind to EGL's opengl ES API. This means your gpu driver f'd up. This is not a Hyprland or Aquamarine issue.");
} }
void CDRMRenderer::initContext(bool GLES2) { void CDRMRenderer::initContext() {
RASSERT(egl.display != nullptr && egl.display != EGL_NO_DISPLAY, "CDRMRenderer: Can't create EGL context without display"); RASSERT(egl.display != nullptr && egl.display != EGL_NO_DISPLAY, "CDRMRenderer: Can't create EGL context without display");
EGLint major, minor; EGLint major, minor;
@ -409,27 +409,15 @@ void CDRMRenderer::initContext(bool GLES2) {
auto attrsNoVer = attrs; auto attrsNoVer = attrs;
if (GLES2) { attrs.push_back(EGL_CONTEXT_MAJOR_VERSION);
attrs.push_back(EGL_CONTEXT_MAJOR_VERSION); attrs.push_back(3);
attrs.push_back(2); attrs.push_back(EGL_CONTEXT_MINOR_VERSION);
attrs.push_back(EGL_CONTEXT_MINOR_VERSION); attrs.push_back(2);
attrs.push_back(0);
} else {
attrs.push_back(EGL_CONTEXT_MAJOR_VERSION);
attrs.push_back(3);
attrs.push_back(EGL_CONTEXT_MINOR_VERSION);
attrs.push_back(2);
}
attrs.push_back(EGL_NONE); attrs.push_back(EGL_NONE);
egl.context = eglCreateContext(egl.display, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attrs.data()); egl.context = eglCreateContext(egl.display, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT, attrs.data());
if (egl.context == EGL_NO_CONTEXT) { if (egl.context == EGL_NO_CONTEXT) {
if (GLES2) {
backend->log(AQ_LOG_ERROR, "CDRMRenderer: Can't create renderer, eglCreateContext failed with GLES 2.0");
return;
}
backend->log(AQ_LOG_ERROR, "CDRMRenderer: eglCreateContext failed with GLES 3.2, retrying GLES 3.0"); backend->log(AQ_LOG_ERROR, "CDRMRenderer: eglCreateContext failed with GLES 3.2, retrying GLES 3.0");
attrs = attrsNoVer; attrs = attrsNoVer;
@ -467,7 +455,7 @@ void CDRMRenderer::initContext(bool GLES2) {
free(drmName); free(drmName);
} }
backend->log(AQ_LOG_DEBUG, std::format("Creating {}CDRMRenderer on gpu {}", GLES2 ? "GLES2 " : "", gpuName)); backend->log(AQ_LOG_DEBUG, std::format("Creating CDRMRenderer on gpu {}", gpuName));
backend->log(AQ_LOG_DEBUG, std::format("Using: {}", (char*)glGetString(GL_VERSION))); backend->log(AQ_LOG_DEBUG, std::format("Using: {}", (char*)glGetString(GL_VERSION)));
backend->log(AQ_LOG_DEBUG, std::format("Vendor: {}", (char*)glGetString(GL_VENDOR))); backend->log(AQ_LOG_DEBUG, std::format("Vendor: {}", (char*)glGetString(GL_VENDOR)));
backend->log(AQ_LOG_DEBUG, std::format("Renderer: {}", (char*)glGetString(GL_RENDERER))); backend->log(AQ_LOG_DEBUG, std::format("Renderer: {}", (char*)glGetString(GL_RENDERER)));
@ -504,7 +492,7 @@ void CDRMRenderer::initResources() {
gl.shaderExt.createVao(); gl.shaderExt.createVao();
} }
SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, int drmFD, bool GLES2) { SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, int drmFD) {
SP<CDRMRenderer> renderer = SP<CDRMRenderer>(new CDRMRenderer()); SP<CDRMRenderer> renderer = SP<CDRMRenderer>(new CDRMRenderer());
renderer->drmFD = drmFD; renderer->drmFD = drmFD;
renderer->backend = backend_; renderer->backend = backend_;
@ -537,7 +525,7 @@ SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, int drmFD, bool GL
return nullptr; return nullptr;
} }
renderer->initContext(GLES2); renderer->initContext();
if (renderer->egl.context == nullptr || renderer->egl.context == EGL_NO_CONTEXT) if (renderer->egl.context == nullptr || renderer->egl.context == EGL_NO_CONTEXT)
return nullptr; return nullptr;
@ -546,7 +534,7 @@ SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, int drmFD, bool GL
return renderer; return renderer;
} }
SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, Hyprutils::Memory::CSharedPointer<CGBMAllocator> allocator_, bool GLES2) { SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, Hyprutils::Memory::CSharedPointer<CGBMAllocator> allocator_) {
SP<CDRMRenderer> renderer = SP<CDRMRenderer>(new CDRMRenderer()); SP<CDRMRenderer> renderer = SP<CDRMRenderer>(new CDRMRenderer());
renderer->drmFD = allocator_->drmFD(); renderer->drmFD = allocator_->drmFD();
renderer->backend = backend_; renderer->backend = backend_;
@ -573,7 +561,7 @@ SP<CDRMRenderer> CDRMRenderer::attempt(SP<CBackend> backend_, Hyprutils::Memory:
return nullptr; return nullptr;
} }
renderer->initContext(GLES2); renderer->initContext();
if (renderer->egl.context == nullptr || renderer->egl.context == EGL_NO_CONTEXT) if (renderer->egl.context == nullptr || renderer->egl.context == EGL_NO_CONTEXT)
return nullptr; return nullptr;

6
src/backend/drm/Renderer.hpp
View file

@ -68,9 +68,9 @@ namespace Aquamarine {
public: public:
~CDRMRenderer(); ~CDRMRenderer();
static Hyprutils::Memory::CSharedPointer<CDRMRenderer> attempt(Hyprutils::Memory::CSharedPointer<CBackend> backend_, int drmFD, bool GLES2 = true); static Hyprutils::Memory::CSharedPointer<CDRMRenderer> attempt(Hyprutils::Memory::CSharedPointer<CBackend> backend_, int drmFD);
static Hyprutils::Memory::CSharedPointer<CDRMRenderer> attempt(Hyprutils::Memory::CSharedPointer<CBackend> backend_, static Hyprutils::Memory::CSharedPointer<CDRMRenderer> attempt(Hyprutils::Memory::CSharedPointer<CBackend> backend_,
Hyprutils::Memory::CSharedPointer<CGBMAllocator> allocator_, bool GLES2 = true); Hyprutils::Memory::CSharedPointer<CGBMAllocator> allocator_);
int drmFD = -1; int drmFD = -1;
@ -195,7 +195,7 @@ namespace Aquamarine {
void loadEGLAPI(); void loadEGLAPI();
EGLDeviceEXT eglDeviceFromDRMFD(int drmFD); EGLDeviceEXT eglDeviceFromDRMFD(int drmFD);
void initContext(bool GLES2); void initContext();
void initResources(); void initResources();
bool initDRMFormats(); bool initDRMFormats();
std::optional<std::vector<std::pair<uint64_t, bool>>> getModsForFormat(EGLint format); std::optional<std::vector<std::pair<uint64_t, bool>>> getModsForFormat(EGLint format);