Rend2 SP by SomaZ · Pull Request #1179 · JACoders/OpenJK

SomaZ · 2023-10-08T23:35:04Z

So, this is basically a SP port of rend2. This also puts most of the rend2 code to the shared folder. I also started reducing the differences between SP and MP renderer APIs but I think I can do some more, so just a draft for now. This also needs testing.

Many thanks to @AntiAnti for doing the initial SP port and for the additions to the weather code.

Theres a define in MP that clashes, so it was renamed in MP. Apply this to vanilla too. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

q_shared.h defines "int COM_GetCurrentParseLine( void )" q_shared.cpp implemented "int COM_GetCurrentParseLine( int index )" Fixed now, so function can actually be used. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Cleaned up alot of noise. Code formating will happen in another commit. All work based on: https://github.com/AntiAnti/OpenJK Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

To match MP

Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.

cg_showtris 1 shouldnt use depth culling. Had overseen this before.

ifdefed sp / mp differences

The saber marks in SP use some additional scaling and there's some missing parts still. Also fixed incorrect ifdeffed if else constructs.

Added working IsShaking Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.

when G2_PERFORMANCE_ANALYSIS

Compiles, haven't tested it though

You can now load yavin_swamp again.

Same fix as ioquake/ioq3@d824cfa

This time making sure it's not messing up. RT_BEAM code issues a drawcall, potentially using previously added entity surfaces in tess messing up the rendering pipeline. Issue was visable at the end of nar_starpad in JO.

It could happen that tr.defaultShader is set to be mergable which is a bad idea because tr.defaultShader is forced for the depth prepass.

…table (#67) * [rend2] Fix gore buffer incorrectly using `glBufferSubData` when immutable * [rend2] Unmap the gore buffer on shutdown when immutable * [rend2] Missing preprocessor guards

* [rend2] Fix dissolve wipes * [rend2] No flags for common dissolve

Don't shuffle lightmap and diffuse stage if the lightmap stage is dependent on the depth write of the first stage.

JOs default is overbrightbits 1. Maps looked very dark without this change.

Adds a cvar to adjust chromatic aberration effect strength when refractive surfaces are drawn.

Those were all put into ubos some time ago, so no need for them to exist anymore in this form.

…FrameNumber Just mark the gore data as cached when its actually drawn.

Doesn't readback the depthbuffer anymore to determain if a flare is visable or not. It will now test depth in the vertex shader that is running for the flare and creates degenerate triangles if it's concidered to be occluded.

It always used the approximation that is used for worldsurfaces instead of using the lightgrid info.

Razish mentioned this pull request Oct 11, 2023

Git releases #1102

Open

taysta mentioned this pull request Oct 28, 2023

Rend2 Updates taysta/TaystJK#30

Closed

xycaleth mentioned this pull request Nov 12, 2023

Fix r_showtris #1187

Closed

SomaZ and others added 27 commits December 12, 2023 16:48

Copy all rend2 files to sp directory

a3aa7dd

[vanilla] LS_NONE -> LS_LSNONE

07ab3b0

Theres a define in MP that clashes, so it was renamed in MP. Apply this to vanilla too. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

COM_GetCurrentParseLine fix

99a8eec

q_shared.h defines "int COM_GetCurrentParseLine( void )" q_shared.cpp implemented "int COM_GetCurrentParseLine( int index )" Fixed now, so function can actually be used. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Prepare qcommon and rd-common

c27c4b4

Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Patch rend2 for sp

33045e1

Cleaned up alot of noise. Code formating will happen in another commit. All work based on: https://github.com/AntiAnti/OpenJK Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Move mp rend2 to shared folder

3b7df7a

[SP] rit.Malloc -> rit.Z_Malloc

bef35ee

To match MP

[MP] Get rid of _skinSurface_t

76f8b6c

Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.

[Rend2] Fix cg_showtris depthtest

a8b019a

cg_showtris 1 shouldnt use depth culling. Had overseen this before.

[SP] Match R_LerpTag with MP API

9c85f09

[SP] Match R_LerpTag with MP API for the UI too

b43770d

[SP] Match G2_SetupModelPointers with MP version

0397ddb

[rend2] make sp renderer use the shared rend2 files

a12a5a0

ifdefed sp / mp differences

Remove duplicate files

7464c90

Fix incorrect texture coordnates

e05b65a

The saber marks in SP use some additional scaling and there's some missing parts still. Also fixed incorrect ifdeffed if else constructs.

[rend2] WIP Weather functions

ef4da7b

Added working IsShaking Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

[rend2-sp] Fix broken endscreen yavin2

5e34341

Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.

[rend2-sp] Fix ParseSessions

36d7672

[rend2-sp] Add missing G2 functions

12b51bf

when G2_PERFORMANCE_ANALYSIS

[rend2-sp] Add OpenJO cmake config

156d92a

Compiles, haven't tested it though

[rend2-sp] Add basic JO support

c3bc53d

[rend2] Fix ghoul2 cache crashes

0aaf13b

[rend2] Increase max fog count

0f2c420

You can now load yavin_swamp again.

[rend2-sp] Fix force push refraction and force speed doppelgaenger

080de13

[rend2-sp] Add SP tcGen environment

de7f309

[rend2-sp] Fix SP force lightning

4c11f83

[rend2-sp] Add missing entity surface render types

0f7bbea

SomaZ and others added 17 commits April 16, 2026 15:50

[rend2] Fix MD3 surface with zero shaders dividing by zero

4669e57

Same fix as ioquake/ioq3@d824cfa

[rend2] Merge entity surfaces again

3112fdc

This time making sure it's not messing up. RT_BEAM code issues a drawcall, potentially using previously added entity surfaces in tess messing up the rendering pipeline. Issue was visable at the end of nar_starpad in JO.

[rend2] Fix entity surface merging code ... again

1384a9c

It could happen that tr.defaultShader is set to be mergable which is a bad idea because tr.defaultShader is forced for the depth prepass.

[rend2] Fix r_picmip

e0a855d

[rend2] Fix weather for large weather brushes

23cb06e

[rend2] Prevent a division by 0 in lightall shader code

2c94104

[rend2] Fix non collapsable shaders with lightstyles

a7dd927

[rend2] Fix gore buffer incorrectly using glBufferSubData when immu…

c38bceb

…table (#67) * [rend2] Fix gore buffer incorrectly using `glBufferSubData` when immutable * [rend2] Unmap the gore buffer on shutdown when immutable * [rend2] Missing preprocessor guards

[rend2] Fix dissolve wipes (#68)

4d3177e

* [rend2] Fix dissolve wipes * [rend2] No flags for common dissolve

[rend2] Fix broken stage collapsing after a7dd927

a819327

[rend2] Fix broken stage collapsing after a7dd927 part 2

bc3d975

Don't shuffle lightmap and diffuse stage if the lightmap stage is dependent on the depth write of the first stage.

[rend2] Cache GPU shader programs

36e1341

[rend2] Minor cleanups

0889866

[rend2] Fix dynamic lights on md3 surfaces

2726df4

[rend2] Shorten lightall names to prevent Q_strcat overflow error

1adec07

[rend2] Fix clamping to reported max texture size

78a610a

[JO] Make mapOverbrightbits 1 default and fix rend2 overbright issues

792feb5

JOs default is overbrightbits 1. Maps looked very dark without this change.

SomaZ force-pushed the rend2-unified-wip branch from d316917 to 792feb5 Compare July 12, 2026 19:57

SomaZ added 12 commits July 12, 2026 21:57

Merge branch 'rend2' into rend2-unified-wip

1a73805

[rend2] Add r_refractionChromaticAberration

c062d95

Adds a cvar to adjust chromatic aberration effect strength when refractive surfaces are drawn.

[rend2] Get rid of most gcc warnings on rend2 compile

615946d

[rend2] Undo temp bone memset -> initializer

89ac59b

[rend2] Make cubemap luma scaling more robust

d2297d6

[rend2] Cleanup uniforms

301f2b7

Those were all put into ubos some time ago, so no need for them to exist anymore in this form.

[rend2] Fix gore uploads being dependant on correct backEndData->real…

05e4c5f

…FrameNumber Just mark the gore data as cached when its actually drawn.

[rend2] Improve flare rendering

cb494ec

Doesn't readback the depthbuffer anymore to determain if a flare is visable or not. It will now test depth in the vertex shader that is running for the flare and creates degenerate triangles if it's concidered to be occluded.

[rend2] Make sure flares can't write to depthbuffer as well

a9134bc

[rend2] Fix deformVertexes bulge speed

b6b6c3d

[rend2] Implement alphaGen lightingSpecular for md3 and glm models

feaaff3

It always used the approximation that is used for worldsurfaces instead of using the lightgrid info.

[rend2] Fix more issues with picmipping and r_simpleMipMaps

e802ed0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rend2 SP - #1179

Rend2 SP#1179
SomaZ wants to merge 205 commits into
JACoders:masterfrom
SomaZ:rend2-unified-wip

SomaZ commented Oct 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

SomaZ commented Oct 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants