hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-09 16:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #777 from Dickby/fix_shader_error

Browse source 
Remove texcoord from QUADFRAGSRC.
This commit is contained in:
Vaxry 2022-10-04 23:20:52 +01:00 committed by GitHub
commit 934f81c93d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/render/OpenGL.cpp
View file

@ -151,7 +151,6 @@ void CHyprOpenGLImpl::initShaders() {
m_RenderData.pCurrentMonData->m_shQUAD.proj = glGetUniformLocation(prog, "proj"); m_RenderData.pCurrentMonData->m_shQUAD.proj = glGetUniformLocation(prog, "proj");
m_RenderData.pCurrentMonData->m_shQUAD.color = glGetUniformLocation(prog, "color"); m_RenderData.pCurrentMonData->m_shQUAD.color = glGetUniformLocation(prog, "color");
m_RenderData.pCurrentMonData->m_shQUAD.posAttrib = glGetAttribLocation(prog, "pos"); 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.topLeft = glGetUniformLocation(prog, "topLeft");
m_RenderData.pCurrentMonData->m_shQUAD.fullSize = glGetUniformLocation(prog, "fullSize"); m_RenderData.pCurrentMonData->m_shQUAD.fullSize = glGetUniformLocation(prog, "fullSize");
m_RenderData.pCurrentMonData->m_shQUAD.radius = glGetUniformLocation(prog, "radius"); m_RenderData.pCurrentMonData->m_shQUAD.radius = glGetUniformLocation(prog, "radius");

1
src/render/shaders/Textures.hpp
View file

@ -54,7 +54,6 @@ void main() {
inline const std::string QUADFRAGSRC = R"#( inline const std::string QUADFRAGSRC = R"#(
precision mediump float; precision mediump float;
varying vec4 v_color; varying vec4 v_color;
varying vec2 v_texcoord;
uniform vec2 topLeft; uniform vec2 topLeft;
uniform vec2 fullSize; uniform vec2 fullSize;

2
subprojects/wlroots

@ -1 +1 @@
Subproject commit 50cc1ef4d3791d86854dd83c15fff17e5ea1a5b6 Subproject commit 2ad25b1460400e66ea26bd6489b04072be7d9dbb