git/SDL3CPlusPlus
1
0
Fork 0
mirror of https://github.com/johndoe6345789/SDL3CPlusPlus.git synced 2026-04-24 21:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(bgfx): Simplify sampler flags and improve logging in graphics backend

Browse Source
This commit is contained in:
johndoe6345789
2026-01-07 00:31:33 +00:00
parent cb5b58ca9e
commit 7488713616
2 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/services/impl/bgfx_graphics_backend.cpp
View File

@@ -51,10 +51,8 @@ bool IsIdentityMatrix(const std::array<float, 16>& value) {
}
uint64_t DefaultSamplerFlags() {
return BGFX_SAMPLER_U_REPEAT |
BGFX_SAMPLER_V_REPEAT |
BGFX_SAMPLER_MIN_LINEAR |
BGFX_SAMPLER_MAG_LINEAR;
// Repeat + linear are the default sampler state in bgfx; no flags needed.
return 0;
}
bgfx::TextureHandle CreateSolidTexture(uint32_t rgba, uint64_t flags) {
@@ -818,35 +816,51 @@ GraphicsPipelineHandle BgfxGraphicsBackend::CreatePipeline(GraphicsDeviceHandle
if (!shaderPaths.textures.empty()) {
const uint64_t samplerFlags = DefaultSamplerFlags();
uint8_t stage = 0;
const uint8_t maxStages = BGFX_CONFIG_MAX_TEXTURE_SAMPLERS;
for (const auto& texture : shaderPaths.textures) {
if (stage >= maxStages) {
if (logger_) {
logger_->Warn("BgfxGraphicsBackend::CreatePipeline: texture limit reached for " +
shaderKey);
}
break;
}
if (texture.uniformName.empty() || texture.path.empty()) {
continue;
}
PipelineEntry::TextureBinding binding{};
binding.stage = stage++;
binding.uniformName = texture.uniformName;
binding.sourcePath = texture.path;
binding.sampler = bgfx::createUniform(binding.uniformName.c_str(), bgfx::UniformType::Sampler);
binding.texture = LoadTextureFromFile(binding.sourcePath, samplerFlags);
if (!bgfx::isValid(binding.texture)) {
binding.texture = CreateSolidTexture(0xff00ffff, samplerFlags);
}
const bgfx::Caps* caps = bgfx::getCaps();
uint8_t maxStages = 0;
if (caps) {
maxStages = static_cast<uint8_t>(std::min<uint32_t>(caps->limits.maxTextureSamplers, 255u));
}
if (logger_) {
logger_->Trace("BgfxGraphicsBackend", "CreatePipeline",
"maxTextureSamplers=" + std::to_string(maxStages));
}
if (maxStages == 0) {
if (logger_) {
logger_->Trace("BgfxGraphicsBackend", "CreatePipeline",
"shaderKey=" + shaderKey +
", textureUniform=" + binding.uniformName +
", texturePath=" + binding.sourcePath +
", stage=" + std::to_string(binding.stage));
logger_->Warn("BgfxGraphicsBackend::CreatePipeline: maxTextureSamplers unavailable for " +
shaderKey);
}
} else {
for (const auto& texture : shaderPaths.textures) {
if (stage >= maxStages) {
if (logger_) {
logger_->Warn("BgfxGraphicsBackend::CreatePipeline: texture limit reached for " +
shaderKey);
}
break;
}
if (texture.uniformName.empty() || texture.path.empty()) {
continue;
}
PipelineEntry::TextureBinding binding{};
binding.stage = stage++;
binding.uniformName = texture.uniformName;
binding.sourcePath = texture.path;
binding.sampler = bgfx::createUniform(binding.uniformName.c_str(),
bgfx::UniformType::Sampler);
binding.texture = LoadTextureFromFile(binding.sourcePath, samplerFlags);
if (!bgfx::isValid(binding.texture)) {
binding.texture = CreateSolidTexture(0xff00ffff, samplerFlags);
}
if (logger_) {
logger_->Trace("BgfxGraphicsBackend", "CreatePipeline",
"shaderKey=" + shaderKey +
", textureUniform=" + binding.uniformName +
", texturePath=" + binding.sourcePath +
", stage=" + std::to_string(binding.stage));
}
entry->textures.push_back(std::move(binding));
}
entry->textures.push_back(std::move(binding));
}
}
GraphicsPipelineHandle handle = reinterpret_cast<GraphicsPipelineHandle>(entry.get());

6
src/services/impl/bgfx_gui_service.cpp
View File

@@ -10,7 +10,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include <lunasvg.h>
#include <lunasvg/lunasvg.h>
#include <algorithm>
#include <cctype>
@@ -23,9 +23,7 @@ namespace sdl3cpp::services::impl {
namespace {
constexpr uint64_t kGuiSamplerFlags = BGFX_SAMPLER_U_CLAMP |
BGFX_SAMPLER_V_CLAMP |
BGFX_SAMPLER_MIN_LINEAR |
BGFX_SAMPLER_MAG_LINEAR;
BGFX_SAMPLER_V_CLAMP;
const char* kGuiVertexSource = R"(
#version 450