From 73fdb9baaf7dbcd0f1fe880de63e787817db5b3e Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 13 Dec 2012 11:39:15 +0100 Subject: [PATCH] Added TextureWrap enum<->OpenGL association Also made array syntax consistent Former-commit-id: 65794e3eec2ea326da0ee71bcd7b8c31632ab71c --- include/Nazara/Renderer/OpenGL.hpp | 1 + src/Nazara/Renderer/OpenGL.cpp | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp index 54ad5fcb5..e8508487f 100644 --- a/include/Nazara/Renderer/OpenGL.hpp +++ b/include/Nazara/Renderer/OpenGL.hpp @@ -87,6 +87,7 @@ namespace NzOpenGL extern GLenum TextureTarget[nzImageType_Max+1]; extern GLenum TextureTargetBinding[nzImageType_Max+1]; extern GLenum TextureTargetProxy[nzImageType_Max+1]; + extern GLenum TextureWrapMode[nzTextureWrap_Max+1]; } NAZARA_API extern PFNGLACTIVETEXTUREPROC glActiveTexture; diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index 910d9bedf..71fbe62ab 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -873,7 +873,7 @@ namespace NzOpenGL GL_ZERO // nzStencilOperation_Zero }; - GLenum TextureTarget[nzImageType_Max+1] + GLenum TextureTarget[nzImageType_Max+1] = { GL_TEXTURE_1D, // nzImageType_1D GL_TEXTURE_1D_ARRAY, // nzImageType_1D_Array @@ -883,7 +883,7 @@ namespace NzOpenGL GL_TEXTURE_CUBE_MAP // nzImageType_Cubemap }; - GLenum TextureTargetBinding[nzImageType_Max+1] + GLenum TextureTargetBinding[nzImageType_Max+1] = { GL_TEXTURE_BINDING_1D, // nzImageType_1D GL_TEXTURE_BINDING_1D_ARRAY, // nzImageType_1D_Array @@ -893,7 +893,7 @@ namespace NzOpenGL GL_TEXTURE_BINDING_CUBE_MAP // nzImageType_Cubemap }; - GLenum TextureTargetProxy[nzImageType_Max+1] + GLenum TextureTargetProxy[nzImageType_Max+1] = { GL_PROXY_TEXTURE_1D, // nzImageType_1D GL_PROXY_TEXTURE_1D_ARRAY, // nzImageType_1D_Array @@ -902,6 +902,12 @@ namespace NzOpenGL GL_PROXY_TEXTURE_3D, // nzImageType_3D GL_PROXY_TEXTURE_CUBE_MAP // nzImageType_Cubemap }; + + GLenum TextureWrapMode[nzTextureWrap_Max+1] = + { + GL_CLAMP_TO_EDGE, // nzTextureWrap_Clamp + GL_REPEAT // nzTextureWrap_Repeat + }; } PFNGLACTIVETEXTUREPROC glActiveTexture = nullptr;