hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2024-11-17 08:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/renderer: support external rendering

Browse source
This commit is contained in:
Vaxry 2024-07-12 17:20:08 +02:00
parent f3c6b673f9
commit 45bea6dab2
3 changed files with 42 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/allocator/GBM.cpp
View file

@ -53,8 +53,7 @@ static SDRMFormat guessFormatFrom(std::vector<SDRMFormat> formats, bool cursor)
} }
Aquamarine::CGBMBuffer::CGBMBuffer(const SAllocatorBufferParams& params, Hyprutils::Memory::CWeakPointer<CGBMAllocator> allocator_, Aquamarine::CGBMBuffer::CGBMBuffer(const SAllocatorBufferParams& params, Hyprutils::Memory::CWeakPointer<CGBMAllocator> allocator_,
Hyprutils::Memory::CSharedPointer<CSwapchain> swapchain) : Hyprutils::Memory::CSharedPointer<CSwapchain> swapchain) : allocator(allocator_) {
allocator(allocator_) {
if (!allocator) if (!allocator)
return; return;

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

@ -83,6 +83,16 @@ void main() {
gl_FragColor = texture2D(tex, v_texcoord); gl_FragColor = texture2D(tex, v_texcoord);
})#"; })#";
inline const std::string FRAG_SRC_EXT = R"#(
#extension GL_OES_EGL_image_external : require
precision highp float;
varying vec2 v_texcoord; // is in 0-1
uniform samplerExternalOES texture0;
void main() {
gl_FragColor = texture2D(texture0, v_texcoord);
})#";
// ------------------- gbm stuff // ------------------- gbm stuff
static int openRenderNode(int drmFd) { static int openRenderNode(int drmFd) {
@ -150,19 +160,12 @@ std::optional<std::vector<std::pair<uint64_t, bool>>> CDRMRenderer::getModsForFo
egl.eglQueryDmaBufModifiersEXT(egl.display, format, len, mods.data(), external.data(), &len); egl.eglQueryDmaBufModifiersEXT(egl.display, format, len, mods.data(), external.data(), &len);
std::vector<std::pair<uint64_t, bool>> result; std::vector<std::pair<uint64_t, bool>> result;
bool linearIsExternal = false;
for (size_t i = 0; i < mods.size(); ++i) { for (size_t i = 0; i < mods.size(); ++i) {
if (external.at(i)) {
if (mods.at(i) == DRM_FORMAT_MOD_LINEAR)
linearIsExternal = true;
}
result.push_back({mods.at(i), external.at(i)}); result.push_back({mods.at(i), external.at(i)});
} }
// if the driver doesn't mark linear as external, add it. It's allowed unless the driver says otherwise. (e.g. nvidia) if (std::find(mods.begin(), mods.end(), DRM_FORMAT_MOD_LINEAR) == mods.end() && mods.size() == 0)
if (!linearIsExternal && std::find(mods.begin(), mods.end(), DRM_FORMAT_MOD_LINEAR) == mods.end() && mods.size() == 0) result.push_back({DRM_FORMAT_MOD_LINEAR, true});
result.push_back({DRM_FORMAT_MOD_LINEAR, false});
return result; return result;
} }
@ -209,7 +212,7 @@ bool CDRMRenderer::initDRMFormats() {
TRACE(backend->log(AQ_LOG_TRACE, std::format("EGL: GPU Supports Format {} (0x{:x})", fourccToName((uint32_t)fmt), fmt))); TRACE(backend->log(AQ_LOG_TRACE, std::format("EGL: GPU Supports Format {} (0x{:x})", fourccToName((uint32_t)fmt), fmt)));
for (auto& [mod, external] : mods) { for (auto& [mod, external] : mods) {
auto modName = drmGetFormatModifierName(mod); auto modName = drmGetFormatModifierName(mod);
TRACE(backend->log(AQ_LOG_TRACE, std::format("EGL: | with modifier 0x{:x}: {}", mod, modName ? modName : "?unknown?"))); TRACE(backend->log(AQ_LOG_TRACE, std::format("EGL: | {}with modifier 0x{:x}: {}", (external ? "external only " : ""), mod, modName ? modName : "?unknown?")));
free(modName); free(modName);
} }
} }
@ -368,6 +371,17 @@ SP<CDRMRenderer> CDRMRenderer::attempt(int drmfd, SP<CBackend> backend_) {
renderer->gl.shader.texAttrib = glGetAttribLocation(renderer->gl.shader.program, "texcoord"); renderer->gl.shader.texAttrib = glGetAttribLocation(renderer->gl.shader.program, "texcoord");
renderer->gl.shader.tex = glGetUniformLocation(renderer->gl.shader.program, "tex"); renderer->gl.shader.tex = glGetUniformLocation(renderer->gl.shader.program, "tex");
renderer->gl.shaderExt.program = createProgram(VERT_SRC, FRAG_SRC_EXT);
if (renderer->gl.shaderExt.program == 0) {
backend_->log(AQ_LOG_ERROR, "CDRMRenderer: fail, shaderExt failed");
return nullptr;
}
renderer->gl.shaderExt.proj = glGetUniformLocation(renderer->gl.shaderExt.program, "proj");
renderer->gl.shaderExt.posAttrib = glGetAttribLocation(renderer->gl.shaderExt.program, "pos");
renderer->gl.shaderExt.texAttrib = glGetAttribLocation(renderer->gl.shaderExt.program, "texcoord");
renderer->gl.shaderExt.tex = glGetUniformLocation(renderer->gl.shaderExt.program, "tex");
renderer->restoreEGL(); renderer->restoreEGL();
backend_->log(AQ_LOG_DEBUG, "CDRMRenderer: success"); backend_->log(AQ_LOG_DEBUG, "CDRMRenderer: success");
@ -533,7 +547,9 @@ bool CDRMRenderer::blit(SP<IBuffer> from, SP<IBuffer> to) {
} }
} }
TRACE(backend->log(AQ_LOG_TRACE, std::format("EGL (blit): fromTex id {}, image 0x{:x}", fromTex.texid, (uintptr_t)fromTex.image))); TRACE(backend->log(AQ_LOG_TRACE,
std::format("EGL (blit): fromTex id {}, image 0x{:x}, target {}", fromTex.texid, (uintptr_t)fromTex.image,
fromTex.target == GL_TEXTURE_2D ? "GL_TEXTURE_2D" : "GL_TEXTURE_EXTERNAL_OES")));
// then, get a rbo from our to buffer // then, get a rbo from our to buffer
// if it has an attachment, use that // if it has an attachment, use that
@ -568,7 +584,7 @@ bool CDRMRenderer::blit(SP<IBuffer> from, SP<IBuffer> to) {
GLCALL(glGenRenderbuffers(1, &rboID)); GLCALL(glGenRenderbuffers(1, &rboID));
GLCALL(glBindRenderbuffer(GL_RENDERBUFFER, rboID)); GLCALL(glBindRenderbuffer(GL_RENDERBUFFER, rboID));
egl.glEGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER, (GLeglImageOES)rboImage); GLCALL(egl.glEGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER, (GLeglImageOES)rboImage));
GLCALL(glBindRenderbuffer(GL_RENDERBUFFER, 0)); GLCALL(glBindRenderbuffer(GL_RENDERBUFFER, 0));
GLCALL(glGenFramebuffers(1, &fboID)); GLCALL(glGenFramebuffers(1, &fboID));
@ -608,6 +624,8 @@ bool CDRMRenderer::blit(SP<IBuffer> from, SP<IBuffer> to) {
float monitorProj[9]; float monitorProj[9];
matrixIdentity(base); matrixIdentity(base);
auto& SHADER = fromTex.target == GL_TEXTURE_2D ? gl.shader : gl.shaderExt;
// KMS uses flipped y, we have to do FLIPPED_180 // KMS uses flipped y, we have to do FLIPPED_180
matrixTranslate(base, toDma.size.x / 2.0, toDma.size.y / 2.0); matrixTranslate(base, toDma.size.x / 2.0, toDma.size.y / 2.0);
matrixTransform(base, HYPRUTILS_TRANSFORM_FLIPPED_180); matrixTransform(base, HYPRUTILS_TRANSFORM_FLIPPED_180);
@ -628,25 +646,25 @@ bool CDRMRenderer::blit(SP<IBuffer> from, SP<IBuffer> to) {
GLCALL(glTexParameteri(fromTex.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); GLCALL(glTexParameteri(fromTex.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
GLCALL(glTexParameteri(fromTex.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); GLCALL(glTexParameteri(fromTex.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST));
GLCALL(glUseProgram(gl.shader.program)); GLCALL(glUseProgram(SHADER.program));
GLCALL(glDisable(GL_BLEND)); GLCALL(glDisable(GL_BLEND));
GLCALL(glDisable(GL_SCISSOR_TEST)); GLCALL(glDisable(GL_SCISSOR_TEST));
matrixTranspose(glMtx, glMtx); matrixTranspose(glMtx, glMtx);
GLCALL(glUniformMatrix3fv(gl.shader.proj, 1, GL_FALSE, glMtx)); GLCALL(glUniformMatrix3fv(SHADER.proj, 1, GL_FALSE, glMtx));
GLCALL(glUniform1i(gl.shader.tex, 0)); GLCALL(glUniform1i(SHADER.tex, 0));
GLCALL(glVertexAttribPointer(gl.shader.posAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts)); GLCALL(glVertexAttribPointer(SHADER.posAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts));
GLCALL(glVertexAttribPointer(gl.shader.texAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts)); GLCALL(glVertexAttribPointer(SHADER.texAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts));
GLCALL(glEnableVertexAttribArray(gl.shader.posAttrib)); GLCALL(glEnableVertexAttribArray(SHADER.posAttrib));
GLCALL(glEnableVertexAttribArray(gl.shader.texAttrib)); GLCALL(glEnableVertexAttribArray(SHADER.texAttrib));
GLCALL(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4)); GLCALL(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
GLCALL(glDisableVertexAttribArray(gl.shader.posAttrib)); GLCALL(glDisableVertexAttribArray(SHADER.posAttrib));
GLCALL(glDisableVertexAttribArray(gl.shader.texAttrib)); GLCALL(glDisableVertexAttribArray(SHADER.texAttrib));
GLCALL(glBindTexture(fromTex.target, 0)); GLCALL(glBindTexture(fromTex.target, 0));

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

@ -43,10 +43,10 @@ namespace Aquamarine {
void onBufferAttachmentDrop(CDRMRendererBufferAttachment* attachment); void onBufferAttachmentDrop(CDRMRendererBufferAttachment* attachment);
struct { struct {
struct { struct SShader {
GLuint program = 0; GLuint program = 0;
GLint proj = -1, tex = -1, posAttrib = -1, texAttrib = -1; GLint proj = -1, tex = -1, posAttrib = -1, texAttrib = -1;
} shader; } shader, shaderExt;
} gl; } gl;
struct { struct {