summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Dick <felix.dick@web.de>2022-10-05 00:04:32 +0200
committerFelix Dick <felix.dick@web.de>2022-10-05 00:04:32 +0200
commite8be1507ef24e74c799553e39c729fbc355cf986 (patch)
treed1779165a822f9612e9df3dc9ed68bcb414850fa
parent0d702b556d0a52f1df53ac1e52fac11b8302783b (diff)
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.
-rw-r--r--src/render/OpenGL.cpp1
-rw-r--r--src/render/shaders/Textures.hpp1
m---------subprojects/wlroots0
3 files changed, 0 insertions, 2 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
-Subproject 50cc1ef4d3791d86854dd83c15fff17e5ea1a5b
+Subproject 2ad25b1460400e66ea26bd6489b04072be7d9db