OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed gl interface function pointers for all OpenGL32.dll entry points.

Browse source
This commit is contained in:
Christoph Oelckers 2013-09-03 14:05:41 +02:00
commit 26943fe3fd
27 changed files with 732 additions and 882 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/gl/dynlights/gl_lightbuffer.cpp
View file

@ -72,12 +72,12 @@ FLightBuffer::FLightBuffer()
gl.GenBuffers(1, &mIDbuf_Position);
gl.BindBuffer(GL_TEXTURE_BUFFER, mIDbuf_Position);
gl.GenTextures(1, &mIDtex_RGB);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDtex_RGB);
glGenTextures(1, &mIDtex_RGB);
glBindTexture(GL_TEXTURE_BUFFER, mIDtex_RGB);
gl.TexBufferARB(GL_TEXTURE_BUFFER, GL_RGBA8, mIDbuf_RGB);
gl.GenTextures(1, &mIDtex_Position);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDtex_Position);
glGenTextures(1, &mIDtex_Position);
glBindTexture(GL_TEXTURE_BUFFER, mIDtex_Position);
gl.TexBufferARB(GL_TEXTURE_BUFFER, GL_RGBA32F, mIDbuf_Position);
}
@ -94,9 +94,9 @@ FLightBuffer::~FLightBuffer()
gl.DeleteBuffers(1, &mIDbuf_RGB);
gl.DeleteBuffers(1, &mIDbuf_Position);
gl.BindTexture(GL_TEXTURE_BUFFER, 0);
gl.DeleteTextures(1, &mIDtex_RGB);
gl.DeleteTextures(1, &mIDtex_Position);
glBindTexture(GL_TEXTURE_BUFFER, 0);
glDeleteTextures(1, &mIDtex_RGB);
glDeleteTextures(1, &mIDtex_Position);
}
@ -109,9 +109,9 @@ FLightBuffer::~FLightBuffer()
void FLightBuffer::BindTextures(int texunit1, int texunit2)
{
gl.ActiveTexture(texunit1);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDtex_RGB);
glBindTexture(GL_TEXTURE_BUFFER, mIDtex_RGB);
gl.ActiveTexture(texunit2);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDtex_Position);
glBindTexture(GL_TEXTURE_BUFFER, mIDtex_Position);
gl.ActiveTexture(GL_TEXTURE0);
}
@ -176,8 +176,8 @@ FLightIndexBuffer::FLightIndexBuffer()
gl.GenBuffers(1, &mIDBuffer);
gl.BindBuffer(GL_TEXTURE_BUFFER, mIDBuffer);
gl.GenTextures(1, &mIDTexture);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDTexture);
glGenTextures(1, &mIDTexture);
glBindTexture(GL_TEXTURE_BUFFER, mIDTexture);
gl.TexBufferARB(GL_TEXTURE_BUFFER, GL_R16UI, mIDBuffer);
}
@ -192,8 +192,8 @@ FLightIndexBuffer::~FLightIndexBuffer()
gl.BindBuffer(GL_TEXTURE_BUFFER, 0);
gl.DeleteBuffers(1, &mIDBuffer);
gl.BindTexture(GL_TEXTURE_BUFFER, 0);
gl.DeleteTextures(1, &mIDTexture);
glBindTexture(GL_TEXTURE_BUFFER, 0);
glDeleteTextures(1, &mIDTexture);
}
@ -234,7 +234,7 @@ void FLightIndexBuffer::SendBuffer()
void FLightIndexBuffer::BindTexture(int texunit1)
{
gl.ActiveTexture(texunit1);
gl.BindTexture(GL_TEXTURE_BUFFER, mIDTexture);
glBindTexture(GL_TEXTURE_BUFFER, mIDTexture);
gl.ActiveTexture(GL_TEXTURE0);
}