From e8be1507ef24e74c799553e39c729fbc355cf986 Mon Sep 17 00:00:00 2001 From: Felix Dick Date: Wed, 5 Oct 2022 00:04:32 +0200 Subject: [PATCH] Remove texcoord from QUADFRAGSRC. texcoord is unused in the rounding part of the textureshaders. QUADFRAGSRC isn't using that variable inside the non rounding code. Because of that opengl optimizes that variable out, and is complaining if glGetAttribLocation is called on it. --- src/render/OpenGL.cpp | 1 - src/render/shaders/Textures.hpp | 1 - subprojects/wlroots | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 7d9df83d..da146027 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -151,7 +151,6 @@ void CHyprOpenGLImpl::initShaders() { m_RenderData.pCurrentMonData->m_shQUAD.proj = glGetUniformLocation(prog, "proj"); m_RenderData.pCurrentMonData->m_shQUAD.color = glGetUniformLocation(prog, "color"); m_RenderData.pCurrentMonData->m_shQUAD.posAttrib = glGetAttribLocation(prog, "pos"); - m_RenderData.pCurrentMonData->m_shQUAD.texAttrib = glGetAttribLocation(prog, "texcoord"); m_RenderData.pCurrentMonData->m_shQUAD.topLeft = glGetUniformLocation(prog, "topLeft"); m_RenderData.pCurrentMonData->m_shQUAD.fullSize = glGetUniformLocation(prog, "fullSize"); m_RenderData.pCurrentMonData->m_shQUAD.radius = glGetUniformLocation(prog, "radius"); diff --git a/src/render/shaders/Textures.hpp b/src/render/shaders/Textures.hpp index 94abeb0d..3b696a70 100644 --- a/src/render/shaders/Textures.hpp +++ b/src/render/shaders/Textures.hpp @@ -54,7 +54,6 @@ void main() { inline const std::string QUADFRAGSRC = R"#( precision mediump float; varying vec4 v_color; -varying vec2 v_texcoord; uniform vec2 topLeft; uniform vec2 fullSize; diff --git a/subprojects/wlroots b/subprojects/wlroots index 50cc1ef4..2ad25b14 160000 --- a/subprojects/wlroots +++ b/subprojects/wlroots @@ -1 +1 @@ -Subproject commit 50cc1ef4d3791d86854dd83c15fff17e5ea1a5b6 +Subproject commit 2ad25b1460400e66ea26bd6489b04072be7d9dbb