Skip to content

Combine OpenGL uniforms into batches #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

Combine OpenGL uniforms into batches #1993

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
229faf1
OpenGL Temporary fix for multiple uniforms
Nov 14, 2025
172ab93
Combine OpenGL uniforms into batches
Nov 16, 2025
08a8d0b
Combine OpenGL uniforms into batches - cleanup
Nov 16, 2025
112dbe3
UniformBufferObject
Nov 18, 2025
a6553e1
Combine OpenGL uniforms into batches
Nov 19, 2025
5e23682
Combine OpenGL uniforms into batches
Nov 19, 2025
e09c985
Combine OpenGL uniforms into batches
Nov 22, 2025
8719f7b
Remove unused file
Nov 22, 2025
33ba0a3
Add missing include
Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions src/Layers/xrRenderGL/glDetailManager_VS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void CDetailManager::hw_Render(CBackend& cmd_list)
//hw_Render_dump (&*hwc_s_array, 0, 1, c_hdr );
hw_Render_dump(cmd_list, consts, wave.div(PI_MUL_2), dir2, 0, 1);
}

#include <glm/glm.hpp>
void CDetailManager::hw_Render_dump(CBackend& cmd_list, const Fvector4& consts, const Fvector4& wave, const Fvector4& wind, u32 var_id,
u32 lod_id)
{
Expand Down Expand Up @@ -148,6 +148,8 @@ void CDetailManager::hw_Render_dump(CBackend& cmd_list, const Fvector4& consts,
VERIFY(c_storage);*/

u32 dwBatch = 0;
std::vector<glm::vec4> uniformBuffer;
uniformBuffer.reserve(hw_BatchSize*4);

for (auto items : vis)
{
Expand All @@ -158,15 +160,17 @@ void CDetailManager::hw_Render_dump(CBackend& cmd_list, const Fvector4& consts,
// Build matrix ( 3x4 matrix, last row - color )
float scale = instance->scale_calculated;
Fmatrix& M = instance->mRotY;
cmd_list.set_ca(&*constArray, base + 0, M._11 * scale, M._21 * scale, M._31 * scale, M._41);
cmd_list.set_ca(&*constArray, base + 1, M._12 * scale, M._22 * scale, M._32 * scale, M._42);
cmd_list.set_ca(&*constArray, base + 2, M._13 * scale, M._23 * scale, M._33 * scale, M._43);

uniformBuffer.emplace_back(M._11 * scale, M._21 * scale, M._31 * scale, M._41);
uniformBuffer.emplace_back(M._12 * scale, M._22 * scale, M._32 * scale, M._42);
uniformBuffer.emplace_back(M._13 * scale, M._23 * scale, M._33 * scale, M._43);

// Build color
// R2 only needs hemisphere
float h = instance->c_hemi;
float s = instance->c_sun;
cmd_list.set_ca(&*constArray, base + 3, s, s, s, h);
/*cmd_list.set_ca(&*constArray, base + 3, s, s, s, h);*/
uniformBuffer.emplace_back(s, s, s, h);
dwBatch ++;
if (dwBatch == hw_BatchSize)
{
Expand All @@ -176,21 +180,22 @@ void CDetailManager::hw_Render_dump(CBackend& cmd_list, const Fvector4& consts,
u32 dwCNT_prims = dwBatch * Object.number_indices / 3;
//RCache.get_ConstantCache_Vertex().b_dirty = TRUE;
//RCache.get_ConstantCache_Vertex().get_array_f().dirty (c_base,c_base+dwBatch*4);

R_constant_load L = constArray->vs;
if (constArray->destination & RC_dest_pixel) { L = constArray->ps; }
if (constArray->destination & RC_dest_vertex) { L = constArray->vs; }
if (constArray->destination & RC_dest_geometry) { L = constArray->gs; }
if (constArray->destination & RC_dest_all) { L = constArray->pp; }

CHK_GL(glProgramUniform4fv(L.program, L.location, uniformBuffer.size(), reinterpret_cast<GLfloat*>(uniformBuffer.data())));
//L.location += dwBatch*4;

cmd_list.Render(D3DPT_TRIANGLELIST, vOffset, 0, dwCNT_verts, iOffset, dwCNT_prims);
cmd_list.stat.r.s_details.add(dwCNT_verts);
uniformBuffer.clear();

// restart
dwBatch = 0;

// Remap constants to memory directly (just in case anything goes wrong)
/*{
void* pVData;
RCache.get_ConstantDirect( strArray,
hw_BatchSize*sizeof(Fvector4)*4,
&pVData, 0, 0);
c_storage = (Fvector4*) pVData;
}
VERIFY(c_storage);*/
}
}
}
Expand All @@ -202,6 +207,15 @@ void CDetailManager::hw_Render_dump(CBackend& cmd_list, const Fvector4& consts,
u32 dwCNT_prims = dwBatch * Object.number_indices / 3;
//RCache.get_ConstantCache_Vertex().b_dirty = TRUE;
//RCache.get_ConstantCache_Vertex().get_array_f().dirty (c_base,c_base+dwBatch*4);
R_constant_load L = constArray->vs;
if (constArray->destination & RC_dest_pixel) { L = constArray->ps; }
if (constArray->destination & RC_dest_vertex) { L = constArray->vs; }
if (constArray->destination & RC_dest_geometry) { L = constArray->gs; }
if (constArray->destination & RC_dest_all) { L = constArray->pp; }

CHK_GL(glProgramUniform4fv(L.program, L.location, uniformBuffer.size(), reinterpret_cast<GLfloat*>(uniformBuffer.data())));
//L.location += dwBatch*4;

cmd_list.Render(D3DPT_TRIANGLELIST, vOffset, 0, dwCNT_verts, iOffset, dwCNT_prims);
cmd_list.stat.r.s_details.add(dwCNT_verts);
}
Expand Down
Loading