OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced builtin texture coordinate vertex attribute.

Browse source
This commit is contained in:
Christoph Oelckers 2014-07-15 00:59:01 +02:00
commit 1b7f5a2e6a
6 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gl/data/gl_vertexbuffer.cpp
View file

@ -115,9 +115,9 @@ FFlatVertexBuffer::FFlatVertexBuffer()
glBindVertexArray(vao_id);
glBindBuffer(GL_ARRAY_BUFFER, vbo_id);
glVertexPointer(3,GL_FLOAT, sizeof(FFlatVertex), &VTO->x);
glTexCoordPointer(2,GL_FLOAT, sizeof(FFlatVertex), &VTO->u);
glVertexAttribPointer(VATTR_TEXCOORD, 2,GL_FLOAT, false, sizeof(FFlatVertex), &VTO->u);
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableVertexAttribArray(VATTR_TEXCOORD);
glBindVertexArray(0);
}
@ -140,6 +140,7 @@ CVAR(Bool, gl_testbuffer, false, 0)
void FFlatVertexBuffer::ImmRenderBuffer(unsigned int primtype, unsigned int offset, unsigned int count)
{
#if 0
if (!gl_testbuffer) // todo: remove the immediate mode calls once the uniform array method has been tested.
{
glBegin(primtype);
@ -151,6 +152,7 @@ void FFlatVertexBuffer::ImmRenderBuffer(unsigned int primtype, unsigned int offs
glEnd();
}
else
#endif
{
if (count > 20)
{