zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- deleted vertex buffer drawing and used immediate mode instead.

Browse source 
This served no benefit and made cleanup harder than necessary.
This commit is contained in:
Christoph Oelckers 2019-09-16 18:12:16 +02:00
parent 20ab1289fd
commit 2a20eb9287
1 changed files with 24 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
source/build/src/polymost.cpp
View file

@ -3053,27 +3053,8 @@ do
if (nn < 3) continue; if (nn < 3) continue;
if (nn+drawpolyVertsOffset > (drawpolyVertsSubBufferIndex+1)*drawpolyVertsBufferLength)
{
if (persistentStreamBuffer)
{
// lock this sub buffer
polymost_lockSubBuffer(drawpolyVertsSubBufferIndex);
drawpolyVertsSubBufferIndex = (drawpolyVertsSubBufferIndex+1)%3;
drawpolyVertsOffset = drawpolyVertsSubBufferIndex*drawpolyVertsBufferLength;
// wait for the next sub buffer to become available before writing to it
// our buffer size should be long enough that no waiting is ever necessary
polymost_waitForSubBuffer(drawpolyVertsSubBufferIndex);
}
else
{
glBufferData(GL_ARRAY_BUFFER, sizeof(float)*5*drawpolyVertsBufferLength, NULL, GL_STREAM_DRAW);
drawpolyVertsOffset = 0;
}
}
vec2f_t const invtsiz2 = { 1.f / tsiz2.x, 1.f / tsiz2.y }; vec2f_t const invtsiz2 = { 1.f / tsiz2.x, 1.f / tsiz2.y };
uint32_t off = persistentStreamBuffer ? drawpolyVertsOffset : 0; glBegin(GL_TRIANGLE_FAN);
for (i = 0; i<nn; ++i) for (i = 0; i<nn; ++i)
{ {
vec2f_t const o = { uu[i], vv[i] }; vec2f_t const o = { uu[i], vv[i] };
@ -3082,68 +3063,43 @@ do
o.x * ngx.v + o.y * ngy.v + ngo.v }; o.x * ngx.v + o.y * ngy.v + ngo.v };
float const r = 1.f/p.d; float const r = 1.f/p.d;
//update texcoords
glTexCoord2f(
(p.u * r - du0 + uoffs) * invtsiz2.x,
p.v * r * invtsiz2.y);
//update verts //update verts
drawpolyVerts[(off+i)*5] = (o.x - ghalfx) * r * grhalfxdown10x; glVertex3f(
drawpolyVerts[(off+i)*5+1] = (ghoriz - o.y) * r * grhalfxdown10; (o.x - ghalfx) * r * grhalfxdown10x,
drawpolyVerts[(off+i)*5+2] = r * (1.f / 1024.f); (ghoriz - o.y) * r * grhalfxdown10,
r * (1.f / 1024.f));
//update texcoords
drawpolyVerts[(off+i)*5+3] = (p.u * r - du0 + uoffs) * invtsiz2.x;
drawpolyVerts[(off+i)*5+4] = p.v * r * invtsiz2.y;
} }
glEnd();
if (!persistentStreamBuffer)
{
glBufferSubData(GL_ARRAY_BUFFER, drawpolyVertsOffset*sizeof(float)*5, nn*sizeof(float)*5, drawpolyVerts);
}
glDrawArrays(GL_TRIANGLE_FAN, drawpolyVertsOffset, nn);
drawpolyVertsOffset += nn;
} }
} }
else else
{ {
if (npoints+drawpolyVertsOffset > (drawpolyVertsSubBufferIndex+1)*drawpolyVertsBufferLength)
{
if (persistentStreamBuffer)
{
// lock this sub buffer
polymost_lockSubBuffer(drawpolyVertsSubBufferIndex);
drawpolyVertsSubBufferIndex = (drawpolyVertsSubBufferIndex+1)%3;
drawpolyVertsOffset = drawpolyVertsSubBufferIndex*drawpolyVertsBufferLength;
// wait for the next sub buffer to become available before writing to it
// our buffer size should be long enough that no waiting is ever necessary
polymost_waitForSubBuffer(drawpolyVertsSubBufferIndex);
}
else
{
glBufferData(GL_ARRAY_BUFFER, sizeof(float)*5*drawpolyVertsBufferLength, NULL, GL_STREAM_DRAW);
drawpolyVertsOffset = 0;
}
}
vec2f_t const scale = { 1.f / tsiz2.x * hacksc.x, 1.f / tsiz2.y * hacksc.y }; vec2f_t const scale = { 1.f / tsiz2.x * hacksc.x, 1.f / tsiz2.y * hacksc.y };
uint32_t off = persistentStreamBuffer ? drawpolyVertsOffset : 0; glBegin(GL_TRIANGLE_FAN);
for (bssize_t i = 0; i < npoints; ++i) for (bssize_t i = 0; i < npoints; ++i)
{ {
float const r = 1.f / dd[i]; float const r = 1.f / dd[i];
//update texcoords
glTexCoord2f(
uu[i] * r * scale.x,
vv[i] * r * scale.y);
//update verts //update verts
drawpolyVerts[(off+i)*5] = (px[i] - ghalfx) * r * grhalfxdown10x; glVertex3f(
drawpolyVerts[(off+i)*5+1] = (ghoriz - py[i]) * r * grhalfxdown10; (px[i] - ghalfx) * r * grhalfxdown10x,
drawpolyVerts[(off+i)*5+2] = r * (1.f / 1024.f); (ghoriz - py[i]) * r * grhalfxdown10,
r * (1.f / 1024.f));
//update texcoords
drawpolyVerts[(off+i)*5+3] = uu[i] * r * scale.x;
drawpolyVerts[(off+i)*5+4] = vv[i] * r * scale.y;
} }
glEnd();
if (!persistentStreamBuffer) }
{
glBufferSubData(GL_ARRAY_BUFFER, drawpolyVertsOffset*sizeof(float)*5, npoints*sizeof(float)*5, drawpolyVerts);
}
glDrawArrays(GL_TRIANGLE_FAN, drawpolyVertsOffset, npoints);
drawpolyVertsOffset += npoints;
}
#ifdef USE_GLEXT #ifdef USE_GLEXT