Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

feat(render): per-frame constants via a FrameConstants UBO — REARCH_RENDER P1

esengined80619e74ffe
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fd4d73ca..c81f6d7b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,7 @@ set(ESENGINE_HEADERS
src/esengine/renderer/DrawCommand.hpp
src/esengine/renderer/DrawList.hpp
src/esengine/renderer/ClipState.hpp
+ src/esengine/renderer/FrameConstants.hpp
src/esengine/renderer/BatchBuilder.hpp
src/esengine/renderer/RenderTypePlugin.hpp
src/esengine/renderer/plugins/BatchPlugin.hpp
diff --git a/docs/REARCH_RENDER.md b/docs/REARCH_RENDER.md
index 3cbea84d3..9fa883765 100644
--- a/docs/REARCH_RENDER.md
+++ b/docs/REARCH_RENDER.md
@@ -121,12 +121,13 @@ TS/WASM 边界对 uniform 布局**不透明**:`renderer_begin(viewProjPtr, tar
- **价值**:keystone 重写 `execute` 时需适配的提交面从 6 条降到 1 条。
- **验证**:`tests/renderer/*` + 像素快照不变;draw call 数不变。
-### P1 — GfxDevice 加 UBO 能力 + FrameUBO(纯加法)
-- `GfxBufferTarget` 加 `Uniform`;GfxDevice 加 `bindUniformBuffer(slot, handle)` + `getUniformBlockIndex` + `setUniformBlockBinding`(GLDevice 实现 `glBindBufferBase`/`glUniformBlockBinding`)。
-- 引入 `FrameUBO{ mat4 u_projection }`;batch/shape shader 改 uniform block;`RenderFrame::begin` 每帧填一次。
-- 旧散装 `u_projection` 路径暂保留作回退。
-- **价值**:WebGL2 下即测得 per-frame uniform 调用数显著下降(病灶 B/C)。
-- **验证**:FrameCapture 对比 uniform/draw 调用数;像素快照不变。
+### P1 — GfxDevice 加 UBO 能力 + FrameUBO(纯加法,已据证据修正)
+- `GfxBufferTarget` 加 `Uniform`;GfxDevice 加 `createBuffer(Uniform)` + `bindUniformBufferBase(point, buffer)` + `getUniformBlockIndex(program, name)` + `uniformBlockBinding(program, idx, point)`(GLDevice 实现 `glBindBufferBase`/`glGetUniformBlockIndex`/`glUniformBlockBinding`)。WebGL2/GLSL ES 3.00 **无 in-shader `binding=` 限定符**,绑定点必须 host 侧 `glUniformBlockBinding` 设。
+- `FrameConstants`(std140)首发只 `mat4 u_projection`(64B,单 mat4 无对齐坑);**一个持久 UBO**,init 创建、`RenderFrame::begin` 每帧 `bufferSubData` 更新一次、绑定点 0 全帧 bind 一次(不走 TransientBufferPool——那是 per-draw 几何流)。
+- 活的 shader 只有 **batch + shape** 两个(其余 6 个 .esshader + 内联 EXT_MESH/PARTICLE_INSTANCE 全死,证据见审计/探查)→ 迁移面极小。**注意:batch.esshader 是 GLSL ES 1.00**(`attribute`/`varying`/`texture2D`/`gl_FragColor`),UBO 需 ES 3.00 → batch 必须先升 `#version 300 es`(已有 ES3.00 参照:`Shader.hpp` 的 `BATCH_VERTEX/FRAGMENT` 内联);shape 已是 ES 3.00。这步并入 RC7-6 的 shader 版本统一。
+- **旧散装 `u_projection` 路径保留**给 custom-geometry/material(`GeometryBindings::draw_mesh` 用散装 `u_projection`+`u_model` 在用户 shader 上)——P1 纯加法、不破这些路径。
+- **价值(修正)**:纯 WebGL2 的 per-frame uniform 节省 **可忽略**(实测路径每帧仅 1–3 次 `setUniformMat4`,按 shader 切换 gate,非 per-draw——原"显著下降"的说法不成立)。P1 的真实价值是 **(a) 最低风险地落地 UBO/bind 机制**(std140 + host 侧 block-binding + ES 版本升级,孤立可逐像素验证,避免与 P2 的 execute 重写纠缠)、**(b) 前向兼容 P2**(UBO 即 BindGroup 的首个非纹理资源,P1 写的 UBO API 被 P2 复用、非废弃)、**(c) WebGPU 前置形态**(WebGPU 无散装 uniform,全是 UBO/bind group)。
+- **验证**:headless `verify:render` 四场景逐像素不变(同 P0);FrameCapture 对比 draw call 数不变。
### P2 — PipelineState + BindGroup + 类型化句柄(keystone 主体)
- 引入 `PipelineState`/`BindGroup`/`TypedHandle`;`GfxDevice` 增 `createPipeline`/`createBindGroup`/`setPipeline`/`setBindGroup`/`draw`。
diff --git a/src/esengine/data/shaders/shape.esshader b/src/esengine/data/shaders/shape.esshader
index f13c07463..7bd95efb0 100644
--- a/src/esengine/data/shaders/shape.esshader
+++ b/src/esengine/data/shaders/shape.esshader
@@ -7,7 +7,9 @@ layout(location = 1) in vec2 a_texCoord;
layout(location = 2) in vec4 a_color;
layout(location = 3) in vec4 a_shapeInfo;
-uniform mat4 u_projection;
+layout(std140) uniform FrameConstants {
+ mat4 u_projection;
+};
out vec2 v_uv;
out vec4 v_color;
diff --git a/src/esengine/renderer/DrawList.cpp b/src/esengine/renderer/DrawList.cpp
index 8dede258d..1377323f4 100644
--- a/src/esengine/renderer/DrawList.cpp
+++ b/src/esengine/renderer/DrawList.cpp
@@ -59,7 +59,6 @@ void DrawList::finalize() {
}
void DrawList::execute(GfxDevice& device, StateTracker& state, TransientBufferPool& buffers,
- const glm::mat4& viewProjection,
FrameCapture* capture,
const CustomDrawFn& customDraw) {
u32 lastShader = 0;
@@ -68,10 +67,6 @@ void DrawList::execute(GfxDevice& device, StateTracker& state, TransientBufferPo
if (cmd.shader_id != lastShader) {
state.useProgram(cmd.shader_id);
- i32 loc = device.getUniformLocation(cmd.shader_id, "u_projection");
- if (loc >= 0) {
- device.setUniformMat4(loc, &viewProjection[0][0]);
- }
lastShader = cmd.shader_id;
}
state.setBlendMode(cmd.blend_mode);
diff --git a/src/esengine/renderer/DrawList.hpp b/src/esengine/renderer/DrawList.hpp
index 498054dce..edc9dd09f 100644
--- a/src/esengine/renderer/DrawList.hpp
+++ b/src/esengine/renderer/DrawList.hpp
@@ -25,8 +25,9 @@ public:
void finalize();
+ // Per-frame constants (view-projection) come from the FrameConstants UBO bound by
+ // RenderContext, not a uniform argument — every batched shader reads it from there.
void execute(GfxDevice& device, StateTracker& state, TransientBufferPool& buffers,
- const glm::mat4& viewProjection,
FrameCapture* capture = nullptr,
const CustomDrawFn& customDraw = nullptr);
diff --git a/src/esengine/renderer/FrameConstants.hpp b/src/esengine/renderer/FrameConstants.hpp
new file mode 100644
index 000000000..05d7daea3
--- /dev/null
+++ b/src/esengine/renderer/FrameConstants.hpp
@@ -0,0 +1,41 @@
+/**
+ * @file FrameConstants.hpp
+ * @brief Per-frame shader constants shared via a single Uniform Buffer Object.
+ * @details The engine's per-frame data (the view-projection) lives in exactly one
+ * UBO, bound once per frame at FRAME_CONSTANTS_BINDING. Every engine shader
+ * declares `layout(std140) uniform FrameConstants { mat4 u_projection; };`
+ * and Shader::compile auto-links that block to the binding point — there is
+ * no loose per-shader u_projection upload. This is the first non-texture
+ * resource of the eventual P2 BindGroup model (docs/REARCH_RENDER.md).
+ *
+ * @author ESEngine Team
+ * @date 2026
+ *
+ * @copyright Copyright (c) 2026 ESEngine Team
+ * Licensed under the MIT License.
+ */
+#pragma once
+
+#include "../core/Types.hpp"
+
+#include <glm/glm.hpp>
+
+namespace esengine {
+
+/**
+ * @brief CPU mirror of the GLSL FrameConstants block (std140).
+ * @details A lone mat4 occupies 64 bytes at offset 0 with 16-byte alignment, so the
+ * std140 layout needs no padding. Append future per-frame fields here and in
+ * the shader block in the same order (std140 keeps prior offsets stable).
+ */
+struct FrameConstants {
+ glm::mat4 viewProjection{1.0f};
+};
+
+/** @brief Indexed uniform binding point the FrameConstants block is bound to. */
+inline constexpr u32 FRAME_CONSTANTS_BINDING = 0;
+
+/** @brief GLSL block name; must match the shader declarations and Shader::compile lookup. */
+inline constexpr const char* FRAME_CONSTANTS_BLOCK = "FrameConstants";
+
+} // namespace esengine
diff --git a/src/esengine/renderer/GLDevice.cpp b/src/esengine/renderer/GLDevice.cpp
index 7a248fa4b..e1deff289 100644
--- a/src/esengine/renderer/GLDevice.cpp
+++ b/src/esengine/renderer/GLDevice.cpp
@@ -87,8 +87,9 @@ void setCapability(GLenum cap, bool enabled) {
GLenum toGLBufferTarget(GfxBufferTarget target) {
switch (target) {
- case GfxBufferTarget::Vertex: return GL_ARRAY_BUFFER;
- case GfxBufferTarget::Index: return GL_ELEMENT_ARRAY_BUFFER;
+ case GfxBufferTarget::Vertex: return GL_ARRAY_BUFFER;
+ case GfxBufferTarget::Index: return GL_ELEMENT_ARRAY_BUFFER;
+ case GfxBufferTarget::Uniform: return GL_UNIFORM_BUFFER;
default: return GL_ARRAY_BUFFER;
}
}
@@ -569,6 +570,22 @@ void GLDevice::bufferSubData(GfxBufferTarget target, u32 offset, const void* dat
glBufferSubData(toGLBufferTarget(target), offset, sizeBytes, data);
}
+void GLDevice::bindUniformBuffer(u32 bufferId) {
+ glBindBuffer(GL_UNIFORM_BUFFER, bufferId);
+}
+
+void GLDevice::bindBufferBase(u32 bindingPoint, u32 bufferId) {
+ glBindBufferBase(GL_UNIFORM_BUFFER, bindingPoint, bufferId);
+}
+
+u32 GLDevice::getUniformBlockIndex(u32 programId, const char* name) {
+ return static_cast<u32>(glGetUniformBlockIndex(programId, name));
+}
+
+void GLDevice::uniformBlockBinding(u32 programId, u32 blockIndex, u32 bindingPoint) {
+ glUniformBlockBinding(programId, blockIndex, bindingPoint);
+}
+
// =============================================================================
// VAO Operations
// =============================================================================
diff --git a/src/esengine/renderer/GLDevice.hpp b/src/esengine/renderer/GLDevice.hpp
index 1c8beba03..35af25f12 100644
--- a/src/esengine/renderer/GLDevice.hpp
+++ b/src/esengine/renderer/GLDevice.hpp
@@ -83,6 +83,11 @@ public:
void bufferData(GfxBufferTarget target, const void* data, u32 sizeBytes, bool dynamic) override;
void bufferSubData(GfxBufferTarget target, u32 offset, const void* data, u32 sizeBytes) override;
+ void bindUniformBuffer(u32 bufferId) override;
+ void bindBufferBase(u32 bindingPoint, u32 bufferId) override;
+ u32 getUniformBlockIndex(u32 programId, const char* name) override;
+ void uniformBlockBinding(u32 programId, u32 blockIndex, u32 bindingPoint) override;
+
u32 createVertexArray() override;
void deleteVertexArray(u32 vaoId) override;
void bindVertexArray(u32 vaoId) override;
diff --git a/src/esengine/renderer/GfxDevice.hpp b/src/esengine/renderer/GfxDevice.hpp
index 09fb4539b..5bf16f2dc 100644
--- a/src/esengine/renderer/GfxDevice.hpp
+++ b/src/esengine/renderer/GfxDevice.hpp
@@ -37,6 +37,9 @@ namespace esengine {
* @details Stateless command interface — each method maps 1:1 to a GPU API call.
* StateTracker wraps this with caching to eliminate redundant state changes.
*/
+/** @brief Sentinel returned by getUniformBlockIndex when a program has no such block (GL_INVALID_INDEX). */
+static constexpr u32 GFX_INVALID_UNIFORM_BLOCK = 0xFFFFFFFFu;
+
class GfxDevice {
public:
virtual ~GfxDevice() = default;
@@ -212,6 +215,22 @@ public:
/** @brief Updates a sub-region of a buffer target */
virtual void bufferSubData(GfxBufferTarget target, u32 offset, const void* data, u32 sizeBytes) = 0;
+ // =========================================================================
+ // Uniform Buffer Objects (per-frame / shared constants)
+ // =========================================================================
+
+ /** @brief Binds a buffer to the uniform target (for data upload via bufferData/bufferSubData). */
+ virtual void bindUniformBuffer(u32 bufferId) = 0;
+
+ /** @brief Binds a buffer to an indexed uniform binding point (the slot shaders read from). */
+ virtual void bindBufferBase(u32 bindingPoint, u32 bufferId) = 0;
+
+ /** @brief Returns a program's uniform-block index by name, or GFX_INVALID_UNIFORM_BLOCK if absent. */
+ virtual u32 getUniformBlockIndex(u32 programId, const char* name) = 0;
+
+ /** @brief Links a program's uniform block to an indexed binding point. */
+ virtual void uniformBlockBinding(u32 programId, u32 blockIndex, u32 bindingPoint) = 0;
+
// =========================================================================
// VAO Operations
// =========================================================================
diff --git a/src/esengine/renderer/GfxEnums.hpp b/src/esengine/renderer/GfxEnums.hpp
index 235d801aa..e8e18dd11 100644
--- a/src/esengine/renderer/GfxEnums.hpp
+++ b/src/esengine/renderer/GfxEnums.hpp
@@ -25,6 +25,7 @@ namespace esengine {
enum class GfxBufferTarget : u8 {
Vertex,
Index,
+ Uniform,
};
// =============================================================================
diff --git a/src/esengine/renderer/ImmediateDraw.cpp b/src/esengine/renderer/ImmediateDraw.cpp
index 8cb546355..f48a65806 100644
--- a/src/esengine/renderer/ImmediateDraw.cpp
+++ b/src/esengine/renderer/ImmediateDraw.cpp
@@ -89,7 +89,9 @@ void ImmediateDraw::shutdown() {
void ImmediateDraw::begin(const glm::mat4& viewProjection) {
if (!initialized_) return;
- viewProjection_ = viewProjection;
+ // The batch shader reads u_projection from the shared FrameConstants UBO; update it
+ // for this pass rather than uploading a loose uniform per flush.
+ context_.updateFrameConstants(viewProjection);
state_.setBlendEnabled(true);
state_.setBlendMode(BlendMode::Normal);
state_.setDepthTest(false);
@@ -108,8 +110,6 @@ void ImmediateDraw::flush() {
pool_.upload();
state_.useProgram(batch_shader_id_);
- i32 loc = device_.getUniformLocation(batch_shader_id_, "u_projection");
- if (loc >= 0) device_.setUniformMat4(loc, glm::value_ptr(viewProjection_));
state_.bindTexture(0, currentTexture_);
pool_.bindLayout(LayoutId::Batch);
diff --git a/src/esengine/renderer/ImmediateDraw.hpp b/src/esengine/renderer/ImmediateDraw.hpp
index 1df59c255..41ada1643 100644
--- a/src/esengine/renderer/ImmediateDraw.hpp
+++ b/src/esengine/renderer/ImmediateDraw.hpp
@@ -175,7 +175,6 @@ private:
TransientBufferPool pool_;
u32 batch_shader_id_ = 0;
u32 white_texture_id_ = 0;
- glm::mat4 viewProjection_{1.0f};
u32 currentTexture_ = 0;
bool pendingGeometry_ = false;
diff --git a/src/esengine/renderer/RenderContext.cpp b/src/esengine/renderer/RenderContext.cpp
index eccf330e4..6e592634c 100644
--- a/src/esengine/renderer/RenderContext.cpp
+++ b/src/esengine/renderer/RenderContext.cpp
@@ -11,8 +11,11 @@
#include "RenderContext.hpp"
#include "GfxDevice.hpp"
+#include "FrameConstants.hpp"
#include "../core/Log.hpp"
+#include <glm/gtc/type_ptr.hpp>
+
namespace esengine {
RenderContext::RenderContext(GfxDevice& device)
@@ -33,6 +36,7 @@ void RenderContext::init() {
device_.init();
initWhiteTexture();
+ initFrameUbo();
initialized_ = true;
}
@@ -47,6 +51,11 @@ void RenderContext::shutdown() {
whiteTextureId_ = 0;
}
+ if (frameUbo_ != 0) {
+ device_.deleteBuffer(frameUbo_);
+ frameUbo_ = 0;
+ }
+
device_.shutdown();
initialized_ = false;
ES_LOG_INFO("RenderContext shutdown");
@@ -63,4 +72,26 @@ void RenderContext::initWhiteTexture() {
ES_LOG_DEBUG("White texture created (ID: {})", whiteTextureId_);
}
+void RenderContext::initFrameUbo() {
+ frameUbo_ = device_.createBuffer();
+
+ FrameConstants initial{};
+ device_.bindUniformBuffer(frameUbo_);
+ device_.bufferData(GfxBufferTarget::Uniform, &initial, sizeof(FrameConstants), /*dynamic=*/true);
+
+ // The binding point persists for the context lifetime; only the contents change
+ // per frame. Every engine shader's FrameConstants block is linked to this point
+ // at compile time (Shader::compile).
+ device_.bindBufferBase(FRAME_CONSTANTS_BINDING, frameUbo_);
+
+ ES_LOG_DEBUG("FrameConstants UBO created (ID: {})", frameUbo_);
+}
+
+void RenderContext::updateFrameConstants(const glm::mat4& viewProjection) {
+ viewProjection_ = viewProjection;
+ device_.bindUniformBuffer(frameUbo_);
+ device_.bufferSubData(GfxBufferTarget::Uniform, 0, glm::value_ptr(viewProjection),
+ sizeof(glm::mat4));
+}
+
} // namespace esengine
diff --git a/src/esengine/renderer/RenderContext.hpp b/src/esengine/renderer/RenderContext.hpp
index 74d09f7fc..380d1d2b6 100644
--- a/src/esengine/renderer/RenderContext.hpp
+++ b/src/esengine/renderer/RenderContext.hpp
@@ -138,13 +138,22 @@ public:
*/
u32 getWhiteTextureId() const { return whiteTextureId_; }
+ /**
+ * @brief Uploads the per-frame view-projection into the shared FrameConstants UBO.
+ * @details Called once per render pass before its draws; every engine shader reads
+ * u_projection from this single UBO (bound at FRAME_CONSTANTS_BINDING).
+ */
+ void updateFrameConstants(const glm::mat4& viewProjection);
+
private:
void initWhiteTexture();
+ void initFrameUbo();
glm::mat4 viewProjection_{1.0f};
RenderContextStats stats_;
u32 whiteTextureId_ = 0;
+ u32 frameUbo_ = 0;
GfxDevice& device_;
bool initialized_ = false;
diff --git a/src/esengine/renderer/RenderFrame.cpp b/src/esengine/renderer/RenderFrame.cpp
index 210974be1..d4db3df63 100644
--- a/src/esengine/renderer/RenderFrame.cpp
+++ b/src/esengine/renderer/RenderFrame.cpp
@@ -1,7 +1,5 @@
#include "RenderFrame.hpp"
#include "Shader.hpp"
-#include "ShaderEmbeds.generated.hpp"
-#include "../resource/ShaderParser.hpp"
#include "../core/Log.hpp"
#include <glm/gtc/type_ptr.hpp>
@@ -193,7 +191,8 @@ void RenderFrame::flush() {
}
};
- draw_list_.execute(device_, state_tracker_, pool_, view_projection_, &frame_capture_, customDrawFn);
+ context_.updateFrameConstants(view_projection_);
+ draw_list_.execute(device_, state_tracker_, pool_, &frame_capture_, customDrawFn);
stats_.draw_calls = draw_list_.mergedDrawCallCount();
for (u32 i = 0; i < draw_list_.commandCount(); ++i) {
@@ -276,7 +275,8 @@ void RenderFrame::replayToDrawCall(i32 stopAtDrawCall) {
frame_capture_.setReplayMode(stopAtDrawCall + 1);
- draw_list_.execute(device_, state_tracker_, pool_, view_projection_, &frame_capture_);
+ context_.updateFrameConstants(view_projection_);
+ draw_list_.execute(device_, state_tracker_, pool_, &frame_capture_);
state_tracker_.setScissorEnabled(false);
state_tracker_.endStencilTest();
@@ -395,28 +395,15 @@ void RenderFrame::collectAll(ecs::Registry& registry, u32 skipFlags) {
u32 RenderFrame::initBatchShader() {
// The batch shader ships embedded as source (ShaderSources::BATCH_*); there is
- // no file-load path on web.
- resource::ShaderHandle handle;
- if (!handle.isValid()) {
- handle = resource_manager_.createShaderWithBindings(
- ShaderSources::BATCH_VERTEX,
- ShaderSources::BATCH_FRAGMENT,
- {{0, "a_position"}, {1, "a_color"}, {2, "a_texCoord"}}
- );
- }
+ // no file-load path on web. WebGL2 guarantees GLSL ES 3.00, so there is no ES 1.0
+ // fallback — the batch shader is unconditionally the ES 3.00 source.
+ resource::ShaderHandle handle = resource_manager_.createShaderWithBindings(
+ ShaderSources::BATCH_VERTEX,
+ ShaderSources::BATCH_FRAGMENT,
+ {{0, "a_position"}, {1, "a_color"}, {2, "a_texCoord"}}
+ );
Shader* shader = resource_manager_.getShader(handle);
- if (!shader || !shader->isValid()) {
- ES_LOG_WARN("GLSL ES 3.0 batch shader failed, trying GLSL ES 1.0 fallback");
- auto parsed = resource::ShaderParser::parse(ShaderEmbeds::BATCH);
- handle = resource_manager_.createShaderWithBindings(
- resource::ShaderParser::assembleStage(parsed, resource::ShaderStage::Vertex),
- resource::ShaderParser::assembleStage(parsed, resource::ShaderStage::Fragment),
- {{0, "a_position"}, {1, "a_color"}, {2, "a_texCoord"}}
- );
- shader = resource_manager_.getShader(handle);
- }
-
if (shader && shader->isValid()) {
shader->bind();
i32 texLoc = device_.getUniformLocation(shader->getProgramId(), "u_texture");
diff --git a/src/esengine/renderer/Shader.cpp b/src/esengine/renderer/Shader.cpp
index 4059845f3..9a9f12917 100644
--- a/src/esengine/renderer/Shader.cpp
+++ b/src/esengine/renderer/Shader.cpp
@@ -14,6 +14,7 @@
#include "Shader.hpp"
#include "GfxDevice.hpp"
+#include "FrameConstants.hpp"
#include "../core/Log.hpp"
#include <fstream>
@@ -153,6 +154,14 @@ bool Shader::compile(const std::string& vertexSrc, const std::string& fragmentSr
reflectActiveUniforms();
+ // Link the per-frame constants block to its shared binding point, so the program
+ // reads u_projection from the FrameConstants UBO with no loose uniform upload.
+ // Programs without the block (custom/user shaders) simply skip this.
+ u32 frameBlock = device_->getUniformBlockIndex(programId_, FRAME_CONSTANTS_BLOCK);
+ if (frameBlock != GFX_INVALID_UNIFORM_BLOCK) {
+ device_->uniformBlockBinding(programId_, frameBlock, FRAME_CONSTANTS_BINDING);
+ }
+
ES_LOG_DEBUG("Shader compiled successfully (program ID: {}, active uniforms: {})",
programId_, activeUniforms_.size());
return true;
diff --git a/src/esengine/renderer/Shader.hpp b/src/esengine/renderer/Shader.hpp
index 5e7013b81..c934113d9 100644
--- a/src/esengine/renderer/Shader.hpp
+++ b/src/esengine/renderer/Shader.hpp
@@ -276,7 +276,9 @@ inline const char* BATCH_VERTEX = R"(#version 300 es
layout(location = 1) in vec4 a_color;
layout(location = 2) in vec2 a_texCoord;
- uniform mat4 u_projection;
+ layout(std140) uniform FrameConstants {
+ mat4 u_projection;
+ };
out vec4 v_color;
out vec2 v_texCoord;
diff --git a/src/esengine/renderer/ShaderEmbeds.generated.hpp b/src/esengine/renderer/ShaderEmbeds.generated.hpp
index 2e893d34e..20a6e8bb7 100644
--- a/src/esengine/renderer/ShaderEmbeds.generated.hpp
+++ b/src/esengine/renderer/ShaderEmbeds.generated.hpp
@@ -147,7 +147,9 @@ layout(location = 1) in vec2 a_texCoord;
layout(location = 2) in vec4 a_color;
layout(location = 3) in vec4 a_shapeInfo;
-uniform mat4 u_projection;
+layout(std140) uniform FrameConstants {
+ mat4 u_projection;
+};
out vec2 v_uv;
out vec4 v_color;
diff --git a/src/esengine/renderer/plugins/ShapePlugin.cpp b/src/esengine/renderer/plugins/ShapePlugin.cpp
index 1f76c7d16..799209106 100644
--- a/src/esengine/renderer/plugins/ShapePlugin.cpp
+++ b/src/esengine/renderer/plugins/ShapePlugin.cpp
@@ -129,7 +129,7 @@ void ShapePlugin::customDraw(
if (!shader || !shader->isValid()) return;
shader->bind();
- shader->setUniform("u_projection", ctx.view_projection);
+ // u_projection comes from the shared FrameConstants UBO (linked at compile time).
state.setBlendEnabled(true);
state.setBlendMode(BlendMode::Normal);
diff --git a/tests/renderer/MockGfxDevice.hpp b/tests/renderer/MockGfxDevice.hpp
index b1b48c810..d9fc4b1c8 100644
--- a/tests/renderer/MockGfxDevice.hpp
+++ b/tests/renderer/MockGfxDevice.hpp
@@ -109,6 +109,11 @@ struct MockGfxDevice final : GfxDevice {
void bufferData(GfxBufferTarget, const void*, u32, bool) override { ++bufferDataCalls; }
void bufferSubData(GfxBufferTarget, u32, const void*, u32) override { ++bufferSubDataCalls; }
+ void bindUniformBuffer(u32) override {}
+ void bindBufferBase(u32, u32) override {}
+ u32 getUniformBlockIndex(u32, const char*) override { return GFX_INVALID_UNIFORM_BLOCK; }
+ void uniformBlockBinding(u32, u32, u32) override {}
+
u32 createVertexArray() override { ++createVertexArrayCalls; return nextVaoId++; }
void deleteVertexArray(u32) override { ++deleteVertexArrayCalls; }
void bindVertexArray(u32 vaoId) override { ++bindVertexArrayCalls; lastVao = vaoId; }