From be320bdd97e6203cae4ece7902993f46dff32945 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 27 Oct 2012 16:39:06 +0200 Subject: [PATCH] Changed: Minor changes --- .../3d/driver/opengl/driver_opengl_extension.h | 15 ++++++++------- .../opengl/driver_opengl_vertex_buffer_hard.cpp | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h index 5d58840c1..792555947 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h @@ -55,12 +55,12 @@ struct CGlExtensions bool NVTextureEnvCombine4; bool ARBTextureCubeMap; bool NVVertexProgram; - bool EXTVertexShader; + bool EXTVertexShader; bool NVTextureShader; - bool NVOcclusionQuery; + bool NVOcclusionQuery; bool NVTextureRectangle; - bool EXTTextureRectangle; - bool ARBTextureRectangle; + bool EXTTextureRectangle; + bool ARBTextureRectangle; bool FrameBufferObject; bool FrameBufferBlit; bool FrameBufferMultisample; @@ -89,10 +89,10 @@ struct CGlExtensions // ATI Extensions. bool ATIVertexArrayObject; - bool ATIMapObjectBuffer; + bool ATIMapObjectBuffer; bool ATITextureEnvCombine3; - bool ATIEnvMapBumpMap; - bool ATIFragmentShader; + bool ATIEnvMapBumpMap; + bool ATIFragmentShader; bool ATIXTextureEnvRoute; bool ATIVertexAttribArrayObject; // ARB Extensions @@ -781,3 +781,4 @@ extern NEL_PFNGLSAMPLECOVERAGEARBPROC nglSampleCoverageARB; #endif // USE_OPENGLES #endif // NL_OPENGL_EXTENSION_H + diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp index 06ebafab0..60109cfb6 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp @@ -1542,7 +1542,7 @@ void CVertexBufferHardARB::unlock() #ifdef NL_DEBUG _Unmapping = true; #endif - GLboolean unmapOk = false; + GLboolean unmapOk = GL_FALSE; #ifdef USE_OPENGLES if (_Driver->_Extensions.OESMapBuffer) @@ -1671,3 +1671,4 @@ void CVertexBufferHardARB::invalidate() #endif } // NL3D +