summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Framebuffer.cpp56
-rw-r--r--src/render/Framebuffer.hpp3
-rw-r--r--src/render/OpenGL.hpp2
-rw-r--r--src/render/Renderbuffer.cpp8
-rw-r--r--src/render/Shader.cpp5
5 files changed, 38 insertions, 36 deletions
diff --git a/src/render/Framebuffer.cpp b/src/render/Framebuffer.cpp
index 93f8fe7f..6905eb36 100644
--- a/src/render/Framebuffer.cpp
+++ b/src/render/Framebuffer.cpp
@@ -12,29 +12,26 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
uint32_t glFormat = NFormatUtils::drmFormatToGL(drmFormat);
uint32_t glType = NFormatUtils::glFormatToType(glFormat);
- if (!m_cTex)
+ if (!m_cTex) {
m_cTex = makeShared<CTexture>();
-
- if (!m_iFbAllocated) {
- firstAlloc = true;
- glGenFramebuffers(1, &m_iFb);
- m_iFbAllocated = true;
- }
-
- if (m_cTex->m_iTexID == 0) {
- firstAlloc = true;
m_cTex->allocate();
glBindTexture(GL_TEXTURE_2D, m_cTex->m_iTexID);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ firstAlloc = true;
+ }
+
+ if (!m_iFbAllocated) {
+ glGenFramebuffers(1, &m_iFb);
+ m_iFbAllocated = true;
+ firstAlloc = true;
}
if (firstAlloc || m_vSize != Vector2D(w, h)) {
glBindTexture(GL_TEXTURE_2D, m_cTex->m_iTexID);
glTexImage2D(GL_TEXTURE_2D, 0, glFormat, w, h, 0, GL_RGBA, glType, nullptr);
-
glBindFramebuffer(GL_FRAMEBUFFER, m_iFb);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_cTex->m_iTexID, 0);
@@ -43,9 +40,6 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
if (m_pStencilTex) {
glBindTexture(GL_TEXTURE_2D, m_pStencilTex->m_iTexID);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, w, h, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
-
- glBindFramebuffer(GL_FRAMEBUFFER, m_iFb);
-
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_pStencilTex->m_iTexID, 0);
}
#endif
@@ -57,8 +51,7 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
}
glBindTexture(GL_TEXTURE_2D, 0);
- if (g_pHyprOpenGL)
- glBindFramebuffer(GL_FRAMEBUFFER, g_pHyprOpenGL->m_iCurrentOutputFb);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
m_vSize = Vector2D(w, h);
@@ -80,7 +73,7 @@ void CFramebuffer::addStencil(SP<CTexture> tex) {
RASSERT((status == GL_FRAMEBUFFER_COMPLETE), "Failed adding a stencil to fbo!", status);
glBindTexture(GL_TEXTURE_2D, 0);
- glBindFramebuffer(GL_FRAMEBUFFER, g_pHyprOpenGL->m_iCurrentOutputFb);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
#endif
}
@@ -90,25 +83,36 @@ void CFramebuffer::bind() {
#else
glBindFramebuffer(GL_FRAMEBUFFER, m_iFb);
#endif
+
if (g_pHyprOpenGL)
glViewport(0, 0, g_pHyprOpenGL->m_RenderData.pMonitor->vecPixelSize.x, g_pHyprOpenGL->m_RenderData.pMonitor->vecPixelSize.y);
else
glViewport(0, 0, m_vSize.x, m_vSize.y);
}
-void CFramebuffer::release() {
- if (!m_iFbAllocated && !m_cTex)
- return;
+void CFramebuffer::unbind() {
+#ifndef GLES2
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+#else
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+#endif
+}
- Debug::log(TRACE, "fb {} released", m_iFb);
+void CFramebuffer::release() {
+ if (m_iFbAllocated) {
+ glBindFramebuffer(GL_FRAMEBUFFER, m_iFb);
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
- if (m_iFbAllocated)
glDeleteFramebuffers(1, &m_iFb);
+ m_iFbAllocated = false;
+ m_iFb = 0;
+ }
+
+ if (m_cTex)
+ m_cTex.reset();
- m_cTex.reset();
- m_iFbAllocated = false;
- m_vSize = Vector2D();
- m_iFb = 0;
+ m_vSize = Vector2D();
}
CFramebuffer::~CFramebuffer() {
diff --git a/src/render/Framebuffer.hpp b/src/render/Framebuffer.hpp
index 84dfeef1..092e548e 100644
--- a/src/render/Framebuffer.hpp
+++ b/src/render/Framebuffer.hpp
@@ -11,6 +11,7 @@ class CFramebuffer {
bool alloc(int w, int h, uint32_t format = GL_RGBA);
void addStencil(SP<CTexture> tex);
void bind();
+ void unbind();
void release();
void reset();
bool isAllocated();
@@ -28,4 +29,4 @@ class CFramebuffer {
SP<CTexture> m_pStencilTex;
friend class CRenderbuffer;
-}; \ No newline at end of file
+};
diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp
index 7b7b7e6f..cf1d2549 100644
--- a/src/render/OpenGL.hpp
+++ b/src/render/OpenGL.hpp
@@ -233,8 +233,6 @@ class CHyprOpenGLImpl {
SCurrentRenderData m_RenderData;
- GLint m_iCurrentOutputFb = 0;
-
Hyprutils::OS::CFileDescriptor m_iGBMFD;
gbm_device* m_pGbmDevice = nullptr;
EGLContext m_pEglContext = nullptr;
diff --git a/src/render/Renderbuffer.cpp b/src/render/Renderbuffer.cpp
index 887f31a9..1ea9f785 100644
--- a/src/render/Renderbuffer.cpp
+++ b/src/render/Renderbuffer.cpp
@@ -46,7 +46,7 @@ CRenderbuffer::CRenderbuffer(SP<Aquamarine::IBuffer> buffer, uint32_t format) :
return;
}
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ m_sFramebuffer.unbind();
listeners.destroyBuffer = buffer->events.destroy.registerListener([this](std::any d) { g_pHyprRenderer->onRenderbufferDestroy(this); });
@@ -68,11 +68,7 @@ void CRenderbuffer::bindFB() {
void CRenderbuffer::unbind() {
glBindRenderbuffer(GL_RENDERBUFFER, 0);
-#ifndef GLES2
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-#else
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
-#endif
+ m_sFramebuffer.unbind();
}
CFramebuffer* CRenderbuffer::getFB() {
diff --git a/src/render/Shader.cpp b/src/render/Shader.cpp
index b494d79d..984d8ce3 100644
--- a/src/render/Shader.cpp
+++ b/src/render/Shader.cpp
@@ -17,7 +17,10 @@ CShader::~CShader() {
}
void CShader::destroy() {
+ if (program == 0)
+ return;
+
glDeleteProgram(program);
program = 0;
-} \ No newline at end of file
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-05 05:25:08 +0000