Skip to content

Commit 9517d0e

Browse files
renderer: Added a pointer position uniform to the screen shader. (#10821)
1 parent 78e9edd commit 9517d0e

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION})
107107
pkg_check_modules(aquamarine_dep REQUIRED IMPORTED_TARGET aquamarine>=0.9.0)
108108
pkg_check_modules(hyprlang_dep REQUIRED IMPORTED_TARGET hyprlang>=0.3.2)
109109
pkg_check_modules(hyprcursor_dep REQUIRED IMPORTED_TARGET hyprcursor>=0.1.7)
110-
pkg_check_modules(hyprutils_dep REQUIRED IMPORTED_TARGET hyprutils>=0.7.0)
110+
pkg_check_modules(hyprutils_dep REQUIRED IMPORTED_TARGET hyprutils>=0.8.1)
111111
pkg_check_modules(hyprgraphics_dep REQUIRED IMPORTED_TARGET hyprgraphics>=0.1.3)
112112

113113
string(REPLACE "." ";" AQ_VERSION_LIST ${aquamarine_dep_VERSION})

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ aquamarine = dependency('aquamarine', version: '>=0.9.0')
3535
hyprcursor = dependency('hyprcursor', version: '>=0.1.7')
3636
hyprgraphics = dependency('hyprgraphics', version: '>= 0.1.3')
3737
hyprlang = dependency('hyprlang', version: '>= 0.3.2')
38-
hyprutils = dependency('hyprutils', version: '>= 0.7.0')
38+
hyprutils = dependency('hyprutils', version: '>= 0.8.1')
3939
aquamarine_version_list = aquamarine.version().split('.')
4040
add_project_arguments(['-DAQUAMARINE_VERSION="@0@"'.format(aquamarine.version())], language: 'cpp')
4141
add_project_arguments(['-DAQUAMARINE_VERSION_MAJOR=@0@'.format(aquamarine_version_list.get(0))], language: 'cpp')

src/render/OpenGL.cpp

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "../helpers/MiscFunctions.hpp"
1111
#include "../config/ConfigValue.hpp"
1212
#include "../config/ConfigManager.hpp"
13+
#include "../managers/PointerManager.hpp"
1314
#include "../desktop/LayerSurface.hpp"
1415
#include "../protocols/LayerShell.hpp"
1516
#include "../protocols/core/Compositor.hpp"
@@ -1224,9 +1225,10 @@ void CHyprOpenGLImpl::applyScreenShader(const std::string& path) {
12241225
return;
12251226
}
12261227

1227-
m_finalScreenShader.uniformLocations[SHADER_PROJ] = glGetUniformLocation(m_finalScreenShader.program, "proj");
1228-
m_finalScreenShader.uniformLocations[SHADER_TEX] = glGetUniformLocation(m_finalScreenShader.program, "tex");
1229-
m_finalScreenShader.uniformLocations[SHADER_TIME] = glGetUniformLocation(m_finalScreenShader.program, "time");
1228+
m_finalScreenShader.uniformLocations[SHADER_POINTER] = glGetUniformLocation(m_finalScreenShader.program, "pointer_position");
1229+
m_finalScreenShader.uniformLocations[SHADER_PROJ] = glGetUniformLocation(m_finalScreenShader.program, "proj");
1230+
m_finalScreenShader.uniformLocations[SHADER_TEX] = glGetUniformLocation(m_finalScreenShader.program, "tex");
1231+
m_finalScreenShader.uniformLocations[SHADER_TIME] = glGetUniformLocation(m_finalScreenShader.program, "time");
12301232
if (m_finalScreenShader.uniformLocations[SHADER_TIME] != -1)
12311233
m_finalScreenShader.initialTime = m_globalTimer.getSeconds();
12321234
m_finalScreenShader.uniformLocations[SHADER_WL_OUTPUT] = glGetUniformLocation(m_finalScreenShader.program, "wl_output");
@@ -1241,6 +1243,12 @@ void CHyprOpenGLImpl::applyScreenShader(const std::string& path) {
12411243
}
12421244
m_finalScreenShader.uniformLocations[SHADER_TEX_ATTRIB] = glGetAttribLocation(m_finalScreenShader.program, "texcoord");
12431245
m_finalScreenShader.uniformLocations[SHADER_POS_ATTRIB] = glGetAttribLocation(m_finalScreenShader.program, "pos");
1246+
if (m_finalScreenShader.uniformLocations[SHADER_POINTER] != -1 && *PDT != 0 && !g_pHyprRenderer->m_crashingInProgress) {
1247+
// The screen shader uses the "pointer_position" uniform
1248+
// Since the screen shader could change every frame, damage tracking *needs* to be disabled
1249+
g_pConfigManager->addParseError("Screen shader: Screen shader uses uniform 'pointerPosition', which requires debug:damage_tracking to be switched off.\n"
1250+
"WARNING: Disabling damage tracking will *massively* increase GPU utilization!");
1251+
}
12441252
m_finalScreenShader.createVao();
12451253
}
12461254

@@ -1600,6 +1608,14 @@ void CHyprOpenGLImpl::renderTextureInternalWithDamage(SP<CTexture> tex, const CB
16001608
shader->setUniformFloat2(SHADER_FULL_SIZE, m_renderData.pMonitor->m_pixelSize.x, m_renderData.pMonitor->m_pixelSize.y);
16011609
}
16021610

1611+
if (usingFinalShader && *PDT == 0) {
1612+
PHLMONITORREF pMonitor = m_renderData.pMonitor;
1613+
Vector2D p = ((g_pInputManager->getMouseCoordsInternal() - pMonitor->m_position) * pMonitor->m_scale);
1614+
p = p.transform(wlTransformToHyprutils(pMonitor->m_transform), pMonitor->m_pixelSize);
1615+
shader->setUniformFloat2(SHADER_POINTER, p.x / pMonitor->m_pixelSize.x, p.y / pMonitor->m_pixelSize.y);
1616+
} else if (usingFinalShader)
1617+
shader->setUniformFloat2(SHADER_POINTER, 0.f, 0.f);
1618+
16031619
if (CRASHING) {
16041620
shader->setUniformFloat(SHADER_DISTORT, g_pHyprRenderer->m_crashingDistort);
16051621
shader->setUniformFloat2(SHADER_FULL_SIZE, m_renderData.pMonitor->m_pixelSize.x, m_renderData.pMonitor->m_pixelSize.y);

src/render/Shader.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ enum eShaderUniform : uint8_t {
6262
SHADER_VIBRANCY_DARKNESS,
6363
SHADER_BRIGHTNESS,
6464
SHADER_NOISE,
65+
SHADER_POINTER,
6566

6667
SHADER_LAST,
6768
};

0 commit comments

Comments
 (0)