Replaces Windows line endings with Unix where needed

Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/trunk@410 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 1297d92b
......@@ -183,10 +183,10 @@ Context::~Context()
deleteFramebuffer(mFramebufferMap.begin()->first);
}
while (!mFenceMap.empty())
{
deleteFence(mFenceMap.begin()->first);
}
while (!mFenceMap.empty())
{
deleteFence(mFenceMap.begin()->first);
}
while (!mMultiSampleSupport.empty())
{
......@@ -826,16 +826,16 @@ GLuint Context::createFramebuffer()
GLuint Context::createFence()
{
unsigned int handle = 0;
while (mFenceMap.find(handle) != mFenceMap.end())
{
handle++;
}
mFenceMap[handle] = new Fence;
return handle;
unsigned int handle = 0;
while (mFenceMap.find(handle) != mFenceMap.end())
{
handle++;
}
mFenceMap[handle] = new Fence;
return handle;
}
void Context::deleteBuffer(GLuint buffer)
......@@ -890,16 +890,16 @@ void Context::deleteFramebuffer(GLuint framebuffer)
mFramebufferMap.erase(framebufferObject);
}
}
void Context::deleteFence(GLuint fence)
{
FenceMap::iterator fenceObject = mFenceMap.find(fence);
if (fenceObject != mFenceMap.end())
{
delete fenceObject->second;
mFenceMap.erase(fenceObject);
}
void Context::deleteFence(GLuint fence)
{
FenceMap::iterator fenceObject = mFenceMap.find(fence);
if (fenceObject != mFenceMap.end())
{
delete fenceObject->second;
mFenceMap.erase(fenceObject);
}
}
Buffer *Context::getBuffer(GLuint handle)
......@@ -1044,19 +1044,19 @@ Framebuffer *Context::getFramebuffer(unsigned int handle)
}
}
Fence *Context::getFence(unsigned int handle)
{
FenceMap::iterator fence = mFenceMap.find(handle);
if (fence == mFenceMap.end())
{
return NULL;
}
else
{
return fence->second;
}
}
Fence *Context::getFence(unsigned int handle)
{
FenceMap::iterator fence = mFenceMap.find(handle);
if (fence == mFenceMap.end())
{
return NULL;
}
else
{
return fence->second;
}
}
Buffer *Context::getArrayBuffer()
{
......
......@@ -3632,8 +3632,8 @@ GLboolean __stdcall glIsEnabled(GLenum cap)
return false;
}
GLboolean __stdcall glIsFenceNV(GLuint fence)
{
GLboolean __stdcall glIsFenceNV(GLuint fence)
{
TRACE("(GLuint fence = %d)", fence);
try
......@@ -3658,7 +3658,7 @@ GLboolean __stdcall glIsFenceNV(GLuint fence)
}
return GL_FALSE;
}
}
GLboolean __stdcall glIsFramebuffer(GLuint framebuffer)
{
......@@ -4085,8 +4085,8 @@ void __stdcall glSampleCoverage(GLclampf value, GLboolean invert)
}
}
void __stdcall glSetFenceNV(GLuint fence, GLenum condition)
{
void __stdcall glSetFenceNV(GLuint fence, GLenum condition)
{
TRACE("(GLuint fence = %d, GLenum condition = 0x%X)", fence, condition);
try
......@@ -4114,7 +4114,7 @@ void __stdcall glSetFenceNV(GLuint fence, GLenum condition)
{
return error(GL_OUT_OF_MEMORY);
}
}
}
void __stdcall glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
{
......@@ -4383,8 +4383,8 @@ void __stdcall glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenu
}
}
GLboolean __stdcall glTestFenceNV(GLuint fence)
{
GLboolean __stdcall glTestFenceNV(GLuint fence)
{
TRACE("(GLuint fence = %d)", fence);
try
......@@ -4409,7 +4409,7 @@ GLboolean __stdcall glTestFenceNV(GLuint fence)
}
return GL_TRUE;
}
}
void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
GLint border, GLenum format, GLenum type, const GLvoid* pixels)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment