sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added TextureWrap enum<->OpenGL association 

Also made array syntax consistent


Former-commit-id: 65794e3eec2ea326da0ee71bcd7b8c31632ab71c
This commit is contained in:
Lynix 2012-12-13 11:39:15 +01:00
parent feda7eec4d
commit 73fdb9baaf
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Renderer/OpenGL.hpp
View File

@ -87,6 +87,7 @@ namespace NzOpenGL
extern GLenum TextureTarget[nzImageType_Max+1]; extern GLenum TextureTarget[nzImageType_Max+1];
extern GLenum TextureTargetBinding[nzImageType_Max+1]; extern GLenum TextureTargetBinding[nzImageType_Max+1];
extern GLenum TextureTargetProxy[nzImageType_Max+1]; extern GLenum TextureTargetProxy[nzImageType_Max+1];
extern GLenum TextureWrapMode[nzTextureWrap_Max+1];
} }
NAZARA_API extern PFNGLACTIVETEXTUREPROC glActiveTexture; NAZARA_API extern PFNGLACTIVETEXTUREPROC glActiveTexture;

12
src/Nazara/Renderer/OpenGL.cpp
View File

@ -873,7 +873,7 @@ namespace NzOpenGL
GL_ZERO // nzStencilOperation_Zero GL_ZERO // nzStencilOperation_Zero
}; };
GLenum TextureTarget[nzImageType_Max+1] GLenum TextureTarget[nzImageType_Max+1] =
{ {
GL_TEXTURE_1D, // nzImageType_1D GL_TEXTURE_1D, // nzImageType_1D
GL_TEXTURE_1D_ARRAY, // nzImageType_1D_Array GL_TEXTURE_1D_ARRAY, // nzImageType_1D_Array
@ -883,7 +883,7 @@ namespace NzOpenGL
GL_TEXTURE_CUBE_MAP // nzImageType_Cubemap 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, // nzImageType_1D
GL_TEXTURE_BINDING_1D_ARRAY, // nzImageType_1D_Array GL_TEXTURE_BINDING_1D_ARRAY, // nzImageType_1D_Array
@ -893,7 +893,7 @@ namespace NzOpenGL
GL_TEXTURE_BINDING_CUBE_MAP // nzImageType_Cubemap 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, // nzImageType_1D
GL_PROXY_TEXTURE_1D_ARRAY, // nzImageType_1D_Array GL_PROXY_TEXTURE_1D_ARRAY, // nzImageType_1D_Array
@ -902,6 +902,12 @@ namespace NzOpenGL
GL_PROXY_TEXTURE_3D, // nzImageType_3D GL_PROXY_TEXTURE_3D, // nzImageType_3D
GL_PROXY_TEXTURE_CUBE_MAP // nzImageType_Cubemap 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; PFNGLACTIVETEXTUREPROC glActiveTexture = nullptr;