renderer: add surface shader variants with less branching and uniforms (#13030)
* shader variant features * getSurfaceShader variant with feats * split surface shaders by features * cleanup old shaders
This commit is contained in:
UjinT34
GitHub
parent
f9fb24577a
commit
6c3ebed76e
27 changed files with 273 additions and 414 deletions
|
|
@ -871,21 +871,42 @@ static void processShaderIncludes(std::string& source, const std::map<std::strin
|
|||
}
|
||||
}
|
||||
|
||||
static std::string processShader(const std::string& filename, const std::map<std::string, std::string>& includes) {
|
||||
static const uint8_t MAX_INCLUDE_DEPTH = 3;
|
||||
|
||||
static std::string processShader(const std::string& filename, const std::map<std::string, std::string>& includes, const uint8_t includeDepth = 1) {
|
||||
auto source = loadShader(filename);
|
||||
processShaderIncludes(source, includes);
|
||||
for (auto i = 0; i < includeDepth; i++) {
|
||||
processShaderIncludes(source, includes);
|
||||
}
|
||||
return source;
|
||||
}
|
||||
|
||||
bool CHyprOpenGLImpl::initShaders() {
|
||||
auto shaders = makeShared<SPreparedShaders>();
|
||||
const bool isDynamic = m_shadersInitialized;
|
||||
static const auto PCM = CConfigValue<Hyprlang::INT>("render:cm_enabled");
|
||||
auto shaders = makeShared<SPreparedShaders>();
|
||||
std::map<std::string, std::string> includes;
|
||||
const bool isDynamic = m_shadersInitialized;
|
||||
static const auto PCM = CConfigValue<Hyprlang::INT>("render:cm_enabled");
|
||||
|
||||
try {
|
||||
std::map<std::string, std::string> includes;
|
||||
loadShaderInclude("get_rgb_pixel.glsl", includes);
|
||||
loadShaderInclude("get_rgba_pixel.glsl", includes);
|
||||
loadShaderInclude("get_rgbx_pixel.glsl", includes);
|
||||
loadShaderInclude("discard.glsl", includes);
|
||||
loadShaderInclude("do_discard.glsl", includes);
|
||||
loadShaderInclude("tint.glsl", includes);
|
||||
loadShaderInclude("do_tint.glsl", includes);
|
||||
loadShaderInclude("rounding.glsl", includes);
|
||||
loadShaderInclude("do_rounding.glsl", includes);
|
||||
loadShaderInclude("surface_CM.glsl", includes);
|
||||
loadShaderInclude("CM.glsl", includes);
|
||||
loadShaderInclude("do_CM.glsl", includes);
|
||||
loadShaderInclude("tonemap.glsl", includes);
|
||||
loadShaderInclude("do_tonemap.glsl", includes);
|
||||
loadShaderInclude("sdr_mod.glsl", includes);
|
||||
loadShaderInclude("do_sdr_mod.glsl", includes);
|
||||
loadShaderInclude("primaries_xyz.glsl", includes);
|
||||
loadShaderInclude("primaries_xyz_uniform.glsl", includes);
|
||||
loadShaderInclude("primaries_xyz_const.glsl", includes);
|
||||
loadShaderInclude("gain.glsl", includes);
|
||||
loadShaderInclude("border.glsl", includes);
|
||||
|
||||
|
|
@ -896,17 +917,13 @@ bool CHyprOpenGLImpl::initShaders() {
|
|||
m_cmSupported = false;
|
||||
else {
|
||||
std::vector<SFragShaderDesc> CM_SHADERS = {{
|
||||
{SH_FRAG_CM_RGBA, "CMrgba.frag"},
|
||||
{SH_FRAG_CM_RGBA_DISCARD, "CMrgbadiscard.frag"},
|
||||
{SH_FRAG_CM_RGBX, "CMrgbx.frag"},
|
||||
{SH_FRAG_CM_RGBX_DISCARD, "CMrgbadiscard.frag"},
|
||||
{SH_FRAG_CM_BLURPREPARE, "CMblurprepare.frag"},
|
||||
{SH_FRAG_CM_BORDER1, "CMborder.frag"},
|
||||
}};
|
||||
|
||||
bool success = false;
|
||||
for (const auto& desc : CM_SHADERS) {
|
||||
const auto fragSrc = processShader(desc.file, includes);
|
||||
const auto fragSrc = processShader(desc.file, includes, MAX_INCLUDE_DEPTH);
|
||||
|
||||
if (!(success = shaders->frag[desc.id]->createProgram(shaders->TEXVERTSRC, fragSrc, true, true)))
|
||||
break;
|
||||
|
|
@ -926,11 +943,9 @@ bool CHyprOpenGLImpl::initShaders() {
|
|||
|
||||
std::vector<SFragShaderDesc> FRAG_SHADERS = {{
|
||||
{SH_FRAG_QUAD, "quad.frag"},
|
||||
{SH_FRAG_RGBA, "rgba.frag"},
|
||||
{SH_FRAG_PASSTHRURGBA, "passthru.frag"},
|
||||
{SH_FRAG_MATTE, "rgbamatte.frag"},
|
||||
{SH_FRAG_GLITCH, "glitch.frag"},
|
||||
{SH_FRAG_RGBX, "rgbx.frag"},
|
||||
{SH_FRAG_EXT, "ext.frag"},
|
||||
{SH_FRAG_BLUR1, "blur1.frag"},
|
||||
{SH_FRAG_BLUR2, "blur2.frag"},
|
||||
|
|
@ -941,7 +956,7 @@ bool CHyprOpenGLImpl::initShaders() {
|
|||
}};
|
||||
|
||||
for (const auto& desc : FRAG_SHADERS) {
|
||||
const auto fragSrc = processShader(desc.file, includes);
|
||||
const auto fragSrc = processShader(desc.file, includes, MAX_INCLUDE_DEPTH);
|
||||
|
||||
if (!shaders->frag[desc.id]->createProgram(shaders->TEXVERTSRC, fragSrc, isDynamic))
|
||||
return false;
|
||||
|
|
@ -956,6 +971,7 @@ bool CHyprOpenGLImpl::initShaders() {
|
|||
}
|
||||
|
||||
m_shaders = shaders;
|
||||
m_includes = includes;
|
||||
m_shadersInitialized = true;
|
||||
|
||||
Log::logger->log(Log::DEBUG, "Shaders initialized successfully.");
|
||||
|
|
@ -1311,7 +1327,7 @@ void CHyprOpenGLImpl::renderTextureInternal(SP<CTexture> tex, const CBox& box, c
|
|||
|
||||
const bool CRASHING = m_applyFinalShader && g_pHyprRenderer->m_crashingInProgress;
|
||||
|
||||
auto texType = tex->m_type;
|
||||
uint8_t shaderFeatures = 0;
|
||||
|
||||
if (CRASHING) {
|
||||
shader = m_shaders->frag[SH_FRAG_GLITCH];
|
||||
|
|
@ -1325,8 +1341,8 @@ void CHyprOpenGLImpl::renderTextureInternal(SP<CTexture> tex, const CBox& box, c
|
|||
usingFinalShader = true;
|
||||
} else {
|
||||
switch (tex->m_type) {
|
||||
case TEXTURE_RGBA: shader = m_shaders->frag[SH_FRAG_RGBA]; break;
|
||||
case TEXTURE_RGBX: shader = m_shaders->frag[SH_FRAG_RGBX]; break;
|
||||
case TEXTURE_RGBA: shaderFeatures |= SH_FEAT_RGBA; break;
|
||||
case TEXTURE_RGBX: shaderFeatures &= ~SH_FEAT_RGBA; break;
|
||||
|
||||
case TEXTURE_EXTERNAL: shader = m_shaders->frag[SH_FRAG_EXT]; break; // might be unused
|
||||
default: RASSERT(false, "tex->m_iTarget unsupported!");
|
||||
|
|
@ -1334,10 +1350,8 @@ void CHyprOpenGLImpl::renderTextureInternal(SP<CTexture> tex, const CBox& box, c
|
|||
}
|
||||
}
|
||||
|
||||
if (m_renderData.currentWindow && m_renderData.currentWindow->m_ruleApplicator->RGBX().valueOrDefault()) {
|
||||
shader = m_shaders->frag[SH_FRAG_RGBX];
|
||||
texType = TEXTURE_RGBX;
|
||||
}
|
||||
if (m_renderData.currentWindow && m_renderData.currentWindow->m_ruleApplicator->RGBX().valueOrDefault())
|
||||
shaderFeatures &= ~SH_FEAT_RGBA;
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
tex->bind();
|
||||
|
|
@ -1367,29 +1381,52 @@ void CHyprOpenGLImpl::renderTextureInternal(SP<CTexture> tex, const CBox& box, c
|
|||
(*PPASS == 1 && !isHDRSurface && m_renderData.pMonitor->m_cmType != NCMType::CM_HDR && m_renderData.pMonitor->m_cmType != NCMType::CM_HDR_EDID)) &&
|
||||
m_renderData.pMonitor->inFullscreenMode()) /* Fullscreen window with pass cm enabled */;
|
||||
|
||||
if (!skipCM && !usingFinalShader) {
|
||||
if (!data.discardActive) {
|
||||
if (texType == TEXTURE_RGBA)
|
||||
shader = m_shaders->frag[SH_FRAG_CM_RGBA];
|
||||
else if (texType == TEXTURE_RGBX)
|
||||
shader = m_shaders->frag[SH_FRAG_CM_RGBX];
|
||||
} else {
|
||||
if (texType == TEXTURE_RGBA)
|
||||
shader = m_shaders->frag[SH_FRAG_CM_RGBA_DISCARD];
|
||||
else if (texType == TEXTURE_RGBX)
|
||||
shader = m_shaders->frag[SH_FRAG_CM_RGBA_DISCARD];
|
||||
if (data.discardActive)
|
||||
shaderFeatures |= SH_FEAT_DISCARD;
|
||||
|
||||
if (!usingFinalShader) {
|
||||
if (data.allowDim && m_renderData.currentWindow && (m_renderData.currentWindow->m_notRespondingTint->value() > 0 || m_renderData.currentWindow->m_dimPercent->value() > 0))
|
||||
shaderFeatures |= SH_FEAT_TINT;
|
||||
|
||||
if (data.round > 0)
|
||||
shaderFeatures |= SH_FEAT_ROUNDING;
|
||||
|
||||
if (!skipCM) {
|
||||
shaderFeatures |= SH_FEAT_CM;
|
||||
|
||||
const bool needsSDRmod = isSDR2HDR(imageDescription->value(), m_renderData.pMonitor->m_imageDescription->value());
|
||||
const bool needsHDRmod = !needsSDRmod && isHDR2SDR(imageDescription->value(), m_renderData.pMonitor->m_imageDescription->value());
|
||||
const float maxLuminance = needsHDRmod ?
|
||||
imageDescription->value().getTFMaxLuminance(-1) :
|
||||
(imageDescription->value().luminances.max > 0 ? imageDescription->value().luminances.max : imageDescription->value().luminances.reference);
|
||||
const auto dstMaxLuminance =
|
||||
m_renderData.pMonitor->m_imageDescription->value().luminances.max > 0 ? m_renderData.pMonitor->m_imageDescription->value().luminances.max : 10000;
|
||||
|
||||
if (maxLuminance >= dstMaxLuminance * 1.01)
|
||||
shaderFeatures |= SH_FEAT_TONEMAP;
|
||||
|
||||
if (!data.cmBackToSRGB &&
|
||||
(imageDescription->value().transferFunction == CM_TRANSFER_FUNCTION_SRGB || imageDescription->value().transferFunction == CM_TRANSFER_FUNCTION_GAMMA22) &&
|
||||
m_renderData.pMonitor->m_imageDescription->value().transferFunction == CM_TRANSFER_FUNCTION_ST2084_PQ &&
|
||||
((m_renderData.pMonitor->m_sdrSaturation > 0 && m_renderData.pMonitor->m_sdrSaturation != 1.0f) ||
|
||||
(m_renderData.pMonitor->m_sdrBrightness > 0 && m_renderData.pMonitor->m_sdrBrightness != 1.0f)))
|
||||
shaderFeatures |= SH_FEAT_SDR_MOD;
|
||||
}
|
||||
}
|
||||
|
||||
shader = useShader(shader);
|
||||
if (!shader)
|
||||
shader = getSurfaceShader(shaderFeatures);
|
||||
|
||||
shader = useShader(shader);
|
||||
|
||||
if (!skipCM && !usingFinalShader) {
|
||||
if (data.cmBackToSRGB) {
|
||||
static auto PSDREOTF = CConfigValue<Hyprlang::INT>("render:cm_sdr_eotf");
|
||||
auto chosenSdrEotf = *PSDREOTF != 3 ? NColorManagement::CM_TRANSFER_FUNCTION_GAMMA22 : NColorManagement::CM_TRANSFER_FUNCTION_SRGB;
|
||||
passCMUniforms(shader, imageDescription, CImageDescription::from(NColorManagement::SImageDescription{.transferFunction = chosenSdrEotf}), true, -1, -1);
|
||||
} else
|
||||
passCMUniforms(shader, imageDescription);
|
||||
} else
|
||||
shader = useShader(shader);
|
||||
}
|
||||
|
||||
shader->setUniformMatrix3fv(SHADER_PROJ, 1, GL_TRUE, glMatrix.getMatrix());
|
||||
shader->setUniformInt(SHADER_TEX, 0);
|
||||
|
|
@ -3030,6 +3067,55 @@ bool CHyprOpenGLImpl::explicitSyncSupported() {
|
|||
return m_exts.EGL_ANDROID_native_fence_sync_ext;
|
||||
}
|
||||
|
||||
WP<CShader> CHyprOpenGLImpl::getSurfaceShader(uint8_t features) {
|
||||
if (!m_shaders->fragVariants.contains(features)) {
|
||||
|
||||
auto shader = makeShared<CShader>();
|
||||
auto includes = m_includes;
|
||||
includes["get_rgb_pixel.glsl"] = includes[features & SH_FEAT_RGBA ? "get_rgba_pixel.glsl" : "get_rgbx_pixel.glsl"];
|
||||
if (!(features & SH_FEAT_DISCARD)) {
|
||||
includes["discard.glsl"] = "";
|
||||
includes["do_discard.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_TINT)) {
|
||||
includes["tint.glsl"] = "";
|
||||
includes["do_tint.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_ROUNDING)) {
|
||||
includes["rounding.glsl"] = "";
|
||||
includes["do_rounding.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_CM)) {
|
||||
includes["surface_CM.glsl"] = "";
|
||||
includes["CM.glsl"] = "";
|
||||
includes["do_CM.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_TONEMAP)) {
|
||||
includes["tonemap.glsl"] = "";
|
||||
includes["do_tonemap.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_SDR_MOD)) {
|
||||
includes["sdr_mod.glsl"] = "";
|
||||
includes["do_sdr_mod.glsl"] = "";
|
||||
}
|
||||
if (!(features & SH_FEAT_TONEMAP || features & SH_FEAT_SDR_MOD))
|
||||
includes["primaries_xyz.glsl"] = includes["primaries_xyz_const.glsl"];
|
||||
|
||||
Log::logger->log(Log::INFO, "getSurfaceShader: compiling feature set {}", features);
|
||||
const auto fragSrc = processShader("surface.frag", includes, MAX_INCLUDE_DEPTH);
|
||||
if (shader->createProgram(m_shaders->TEXVERTSRC, fragSrc, true, true)) {
|
||||
m_shaders->fragVariants[features] = shader;
|
||||
return shader;
|
||||
} else {
|
||||
Log::logger->log(Log::ERR, "getSurfaceShader failed for {}. Falling back to old branching", features);
|
||||
m_shaders->fragVariants[features] = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
ASSERT(m_shaders->fragVariants[features]);
|
||||
return m_shaders->fragVariants[features];
|
||||
}
|
||||
|
||||
std::vector<SDRMFormat> CHyprOpenGLImpl::getDRMFormats() {
|
||||
return m_drmFormats;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue