Skip to content

Commit

Permalink
move renderbatches to renderstate for #241
Browse files Browse the repository at this point in the history
  • Loading branch information
@no-lex
no-lex committed Nov 15, 2022
1 parent 523976f commit b53b651
Showing 1 changed file with 41 additions and 38 deletions.
79 changes: 41 additions & 38 deletions src/engine/render/renderva.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ namespace
int globals, tmu;
GLuint textures[7];
Slot *slot;
VSlot *vslot, *texgenvslot;
VSlot *vslot;
int texgenorient, texgenmillis;

void changebatchtmus();
Expand All @@ -645,7 +645,7 @@ namespace
void cleanupgeom();
void enablevattribs(bool all = true);
void disablevattribs(bool all = true);
void changetexgen(int orient, Slot &slot, VSlot &vslot);
void renderbatches(int pass);

renderstate() : colormask(true), depthmask(true), alphaing(0), vbuf(0), vattribs(false),
vquery(false), colorscale(1, 1, 1), alphascale(0), refractscale(0),
Expand All @@ -660,7 +660,10 @@ namespace
}
private:
Slot *texgenslot;
VSlot *texgenvslot;
vec2 texgenscroll;

void changetexgen(int orient, Slot &slot, VSlot &vslot);
};

void renderstate::disablevbuf()
Expand Down Expand Up @@ -1172,61 +1175,61 @@ namespace
numbatches = 0;
}

void renderbatches(renderstate &cur, int pass)
void renderstate::renderbatches(int pass)
{
cur.slot = nullptr;
cur.vslot = nullptr;
slot = nullptr;
vslot = nullptr;
int curbatch = firstbatch;
if(curbatch >= 0)
{
if(!cur.depthmask)
if(!depthmask)
{
cur.depthmask = true;
depthmask = true;
glDepthMask(GL_TRUE);
}
if(!cur.colormask)
if(!colormask)
{
cur.colormask = true;
colormask = true;
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
if(!cur.vattribs)
if(!vattribs)
{
if(cur.vquery)
if(vquery)
{
cur.disablevquery();
disablevquery();
}
cur.enablevattribs();
enablevattribs();
}
}
while(curbatch >= 0)
{
geombatch &b = geombatches[curbatch];
curbatch = b.next;

if(cur.vbuf != b.va->vbuf)
if(vbuf != b.va->vbuf)
{
changevbuf(cur, pass, b.va);
changevbuf(*this, pass, b.va);
}
if(pass == RenderPass_GBuffer || pass == RenderPass_ReflectiveShadowMap)
{
cur.changebatchtmus();
changebatchtmus();
}
if(cur.vslot != &b.vslot)
if(vslot != &b.vslot)
{
changeslottmus(cur, pass, *b.vslot.slot, b.vslot);
if(cur.texgenorient != b.es.orient || (cur.texgenorient < Orient_Any && cur.texgenvslot != &b.vslot))
changeslottmus(*this, pass, *b.vslot.slot, b.vslot);
if(texgenorient != b.es.orient || (texgenorient < Orient_Any && texgenvslot != &b.vslot))
{
cur.changetexgen(b.es.orient, *b.vslot.slot, b.vslot);
changetexgen(b.es.orient, *b.vslot.slot, b.vslot);
}
changeshader(cur, pass, b);
changeshader(*this, pass, b);
}
else
{
if(cur.texgenorient != b.es.orient)
if(texgenorient != b.es.orient)
{
cur.changetexgen(b.es.orient, *b.vslot.slot, b.vslot);
changetexgen(b.es.orient, *b.vslot.slot, b.vslot);
}
updateshader(cur);
updateshader(*this);
}

b.renderbatch();
Expand Down Expand Up @@ -1309,32 +1312,32 @@ namespace
}
if(doquery)
{
STARTVAQUERY(va, { if(geombatches.size()) renderbatches(cur, pass); });
STARTVAQUERY(va, { if(geombatches.size()) cur.renderbatches(pass); });
}
mergetexs(cur, va);
if(doquery)
{
ENDVAQUERY(va, { if(geombatches.size()) renderbatches(cur, pass); });
ENDVAQUERY(va, { if(geombatches.size()) cur.renderbatches(pass); });
}
else if(!batchgeom && geombatches.size())
{
renderbatches(cur, pass);
cur.renderbatches(pass);
}
break;

case RenderPass_GBufferBlend:
if(doquery)
{
STARTVAQUERY(va, { if(geombatches.size()) renderbatches(cur, RenderPass_GBuffer); });
STARTVAQUERY(va, { if(geombatches.size()) cur.renderbatches(RenderPass_GBuffer); });
}
mergetexs(cur, va, &va->texelems[va->texs], 3*va->tris);
if(doquery)
{
ENDVAQUERY(va, { if(geombatches.size()) renderbatches(cur, RenderPass_GBuffer); });
ENDVAQUERY(va, { if(geombatches.size()) cur.renderbatches(RenderPass_GBuffer); });
}
else if(!batchgeom && geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
}
break;

Expand Down Expand Up @@ -1367,15 +1370,15 @@ namespace
mergetexs(cur, va);
if(!batchgeom && geombatches.size())
{
renderbatches(cur, pass);
cur.renderbatches(pass);
}
break;

case RenderPass_ReflectiveShadowMapBlend:
mergetexs(cur, va, &va->texelems[va->texs], 3*va->tris);
if(!batchgeom && geombatches.size())
{
renderbatches(cur, RenderPass_ReflectiveShadowMap);
cur.renderbatches(RenderPass_ReflectiveShadowMap);
}
break;
}
Expand Down Expand Up @@ -2810,7 +2813,7 @@ void renderalphageom(int side)
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
}
}
else
Expand All @@ -2825,7 +2828,7 @@ void renderalphageom(int side)
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
}
glCullFace(GL_BACK);
}
Expand Down Expand Up @@ -2941,7 +2944,7 @@ void rendergeom()
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
glFlush();
}
for(vtxarray *va = visibleva; va; va = va->next)
Expand All @@ -2967,7 +2970,7 @@ void rendergeom()
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
}
}
else
Expand All @@ -2989,7 +2992,7 @@ void rendergeom()
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_GBuffer);
cur.renderbatches(RenderPass_GBuffer);
}
}
if(multipassing)
Expand Down Expand Up @@ -3456,7 +3459,7 @@ void renderrsmgeom(bool dyntex)
}
if(geombatches.size())
{
renderbatches(cur, RenderPass_ReflectiveShadowMap);
cur.renderbatches(RenderPass_ReflectiveShadowMap);
}
cur.cleanupgeom();
}
Expand Down

0 comments on commit b53b651

Please sign in to comment.