Implement PushBuffer #1684

VReaperV · 2025-06-23T11:08:33Z

Requires #1683

Add PushBuffer, update uniforms to have an updateType. The CONST and FRAME uniforms are written into a uniform buffer after the map is loaded/at the start of a frame. This allows skipping some of the glUniform*() calls to decrease the amount of overhead.

This largely re-uses the existing functionality added for the material system.

This will also be needed for #1587

slipher · 2025-07-13T04:30:17Z

This can be rebased now.

VReaperV · 2025-07-20T11:28:03Z

This can be rebased now.

Done.

slipher · 2025-07-24T18:28:51Z

Some issues found with testing:

Fog is not rendered if material system is enabled.
In one scene from my test script the dynamic light from the Painsaw is not rendered. I can't observe this with manual testing so I'd have to investigate more to provide a reliable repro.

slipher · 2025-07-24T18:42:43Z

2. In one scene from my test script the dynamic light from the Painsaw is not rendered. I can't observe this with manual testing so I'd have to investigate more to provide a reliable repro.

Now I found a way. Set common.framerate.max 3 and fire the Painsaw once. On master you will see a frame with the realtime light rendered, but on this branch no. Maybe there is some issue with data being a frame out of date.

src/engine/renderer/gl_shader.h

slipher · 2025-07-25T15:09:49Z

src/engine/renderer/gl_shader.h

-		}
-
-		if ( _shader->UseMaterialSystem() && !_global ) {
+		if ( ( _shader->UseMaterialSystem() && _updateType == MATERIAL_OR_PUSH )


Helper function for this? It's a cryptic and unwieldy expression to have to repeat so many times.

I reworked that part in #1685, it makes the whole uniform caching part much more straightforward.

src/engine/renderer/Material.cpp

VReaperV · 2025-08-01T22:48:46Z

Fog is not rendered if material system is enabled.

Fixed.

VReaperV · 2025-08-01T22:59:22Z

Now I found a way. Set common.framerate.max 3 and fire the Painsaw once. On master you will see a frame with the realtime light rendered, but on this branch no. Maybe there is some issue with data being a frame out of date.

Also fixed.

slipher · 2025-08-02T16:29:00Z

I confirm the 2 previous bugs are fixed. But I get the depth fade issue from #1676 again with this branch when enabling material system. It happens with any depth fade regardless of alpha tests, polygon offset etc. The bug reappears as of the first usable commit Add the remaining code for the global UBO in PushBuffer. (The first four commits don't build; GLUniform._global -> _updateType builds but doesn't render anything.)

VReaperV · 2025-08-02T16:45:55Z

I confirm the 2 previous bugs are fixed. But I get the depth fade issue from #1676 again with this branch when enabling material system. It happens with any depth fade regardless of alpha tests, polygon offset etc. The bug reappears as of the first usable commit Add the remaining code for the global UBO in PushBuffer. (The first four commits don't build; GLUniform._global -> _updateType builds but doesn't render anything.)

The comment there says it was already broken on material system? On my end it was working fine so I can't confirm if there's any issue with it on master right now.

slipher · 2025-08-02T17:00:42Z

It was broken but #1704 fixed it. It works on master.

VReaperV · 2025-08-03T08:45:32Z

It was broken but #1704 fixed it. It works on master.

Not sure what the issue is. I can't reproduce it on my end, and there don't seem to be any depth writes after glTextureBarrier().

slipher · 2025-08-04T02:32:07Z

The depth texture is all garbage all the time, as if it's not hooked up properly. It's still garbage if I set r_materialSystemSkip 1. It's still garbage with r_drawWorld 0 and nothing being rendered.

By the way, I realized you can make a depth texture visualization with just a q3shader, no GLSL required:

depthvis {
    {
        map _white
        depthFade 600
        blendFunc GL_SRC_ALPHA GL_ZERO
    }
}

slipher · 2025-08-04T03:01:23Z

Forgot screenshot

VReaperV · 2025-08-04T06:26:57Z

Hmm, the only thing I could think of is it has something to do with the textures being bindless. This is on AMD + Mesa, right? It might have the same cause as the broken occlusion culling reported there ~1 year ago.

slipher · 2025-08-04T06:53:45Z

This is on AMD + Mesa, right?

Yes

It might have the same cause as the broken occlusion culling reported there ~1 year ago.

On master if I turn on occlusion culling, it segfaults immediately.

VReaperV · 2025-08-04T07:21:19Z

On master if I turn on occlusion culling, it segfaults immediately.

Is the segfault coming from daemon? I don't get any on master.

slipher · 2025-08-04T08:22:16Z

I have provided a stack trace in #1724

slipher · 2025-08-05T03:09:25Z

Hmm, the only thing I could think of is it has something to do with the textures being bindless.

That's true, just r_preferBindlessTextures is enough to trigger the bug.

VReaperV · 2025-08-05T05:38:12Z

Hmm, the only thing I could think of is it has something to do with the textures being bindless.

That's true, just r_preferBindlessTextures is enough to trigger the bug.

Even with the fix from #1725?

VReaperV · 2025-08-05T07:36:03Z

Nevermind, if material system isn't enabled #1725 will have no effect.

VReaperV · 2025-08-05T07:37:08Z

Anyway, I think it's just a driver bug.

Adds `PushBuffer` class, `pushBuffer` global, and the supporting code for `glconfig2`.

Also adds `GLShader.pushSkip` and `GLShader._pushUniforms`. Add `padding` back to the `GLShader` size calculations in material system.

Will be required for `PushBuffer` to set global uniform values outside of their shaders.

This will set `GLShaderManager.globalUniformBlock` to the struct + defines text, which will be the same for all shaders.

This will be required for `PushBuffer` to correctly sort uniforms. Also updates `GLShader.WriteUniformsToBuffer()` to use `mode` and `filter` arguments to select the correct uniforms.

Post-process shaders to actually add the `globalUniformBlock`, add `SetConstUniforms()` and `SetFrameUniforms()` functions to the core and material system renderers, and add the supporting glsl code.

VReaperV added T-Improvement Improvement for an existing feature A-Renderer T-Feature-Request Proposed new feature labels Jun 23, 2025

VReaperV mentioned this pull request Jun 23, 2025

Only update PushBuffer if any uniform has actually changed #1685

Open

VReaperV force-pushed the push-buffer-ubo branch 3 times, most recently from 1e2423c to 1bd0d74 Compare June 30, 2025 15:26

VReaperV force-pushed the push-buffer-ubo branch from 1bd0d74 to 1b41cd4 Compare July 20, 2025 11:27

slipher reviewed Jul 25, 2025

View reviewed changes

VReaperV force-pushed the push-buffer-ubo branch 3 times, most recently from 4b840fd to 3e2071b Compare August 1, 2025 22:48

VReaperV force-pushed the push-buffer-ubo branch 2 times, most recently from 025efe7 to e0bf785 Compare August 12, 2025 05:56

VReaperV force-pushed the push-buffer-ubo branch from e0bf785 to 93e3e66 Compare August 15, 2025 14:11

VReaperV added 9 commits August 18, 2025 08:55

Add PushBuffer

ee400b7

Adds `PushBuffer` class, `pushBuffer` global, and the supporting code for `glconfig2`.

Generalise uniform post-processing

b95363a

Also adds `GLShader.pushSkip` and `GLShader._pushUniforms`. Add `padding` back to the `GLShader` size calculations in material system.

Add GlobalUBOProxy

e97bef7

Will be required for `PushBuffer` to set global uniform values outside of their shaders.

Add PostProcessGlobalUniforms()

7e68a04

This will set `GLShaderManager.globalUniformBlock` to the struct + defines text, which will be the same for all shaders.

GLUniform._global -> _updateType

4fe0887

This will be required for `PushBuffer` to correctly sort uniforms. Also updates `GLShader.WriteUniformsToBuffer()` to use `mode` and `filter` arguments to select the correct uniforms.

Add the remaining code for the global UBO in PushBuffer

00aaab4

Post-process shaders to actually add the `globalUniformBlock`, add `SetConstUniforms()` and `SetFrameUniforms()` functions to the core and material system renderers, and add the supporting glsl code.

Fix global fog texture with PushBuffer

3f0c46f

Fix quake3 fog with material system

8b9930d

Fix wrong refdef/viewParms being used in PushBuffer

310ed75

VReaperV force-pushed the push-buffer-ubo branch from 93e3e66 to 310ed75 Compare August 18, 2025 05:55

Implement PushBuffer #1684

Are you sure you want to change the base?

Implement PushBuffer #1684

Uh oh!

Conversation

VReaperV commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slipher commented Jul 13, 2025

Uh oh!

VReaperV commented Jul 20, 2025

Uh oh!

slipher commented Jul 24, 2025

Uh oh!

slipher commented Jul 24, 2025

Uh oh!

Uh oh!

slipher Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

VReaperV Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

VReaperV commented Aug 1, 2025

Uh oh!

VReaperV commented Aug 1, 2025

Uh oh!

slipher commented Aug 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VReaperV commented Aug 2, 2025

Uh oh!

slipher commented Aug 2, 2025

Uh oh!

VReaperV commented Aug 3, 2025

Uh oh!

slipher commented Aug 4, 2025

Uh oh!

slipher commented Aug 4, 2025

Uh oh!

VReaperV commented Aug 4, 2025

Uh oh!

slipher commented Aug 4, 2025

Uh oh!

VReaperV commented Aug 4, 2025

Uh oh!

slipher commented Aug 4, 2025

Uh oh!

slipher commented Aug 5, 2025

Uh oh!

VReaperV commented Aug 5, 2025

Uh oh!

VReaperV commented Aug 5, 2025

Uh oh!

VReaperV commented Aug 5, 2025

Uh oh!

Uh oh!

VReaperV commented Jun 23, 2025 •

edited

Loading

slipher commented Aug 2, 2025 •

edited

Loading