From b16f2bf7634ec50a1dcd7c9caaada5945facb306 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 25 Apr 2014 20:17:00 +0200 Subject: [PATCH] Added OpenGL function loading glVertexAttrib[I|L]Pointer Also removed useless test (since unsigned can't be under zero..) Former-commit-id: 628172ca764956349db5498b6ac7fec6400febfa --- include/Nazara/Renderer/OpenGL.hpp | 2 ++ src/Nazara/Renderer/OpenGL.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp index cdfe0b075..32903f4cf 100644 --- a/include/Nazara/Renderer/OpenGL.hpp +++ b/include/Nazara/Renderer/OpenGL.hpp @@ -320,6 +320,8 @@ NAZARA_API extern PFNGLUSEPROGRAMPROC glUseProgram; NAZARA_API extern PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f; NAZARA_API extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor; NAZARA_API extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; +NAZARA_API extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer; +NAZARA_API extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer; NAZARA_API extern PFNGLVIEWPORTPROC glViewport; #if defined(NAZARA_PLATFORM_WINDOWS) NAZARA_API extern PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat; diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index 3534255e5..007edd640 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -787,7 +787,7 @@ bool NzOpenGL::Initialize() return false; } - if (minor < 0 || minor > 9) // 0 est une valeur correcte ici (ex: OpenGL 3.0) + if (minor > 9) // 0 est une valeur correcte ici (ex: OpenGL 3.0) { NazaraWarning("Unable to retrieve OpenGL minor version (assuming 0)"); minor = 0; @@ -815,13 +815,13 @@ bool NzOpenGL::Initialize() major = version[0] - '0'; minor = version[2] - '0'; - if (major <= 0 || major > 9) + if (major == 0 || major > 9) { NazaraError("Unable to retrieve GLSL major version"); return false; } - if (minor < 0 || minor > 9) // 0 est une valeur correcte ici (ex: GLSL 4.0) + if (minor > 9) // 0 est une valeur correcte ici (ex: GLSL 4.0) { NazaraWarning("Unable to retrieve GLSL minor version (using 0)"); minor = 0; @@ -967,6 +967,8 @@ bool NzOpenGL::Initialize() glGetStringi = reinterpret_cast(LoadEntry("glGetStringi", false)); glInvalidateBufferData = reinterpret_cast(LoadEntry("glInvalidateBufferData", false)); glMapBufferRange = reinterpret_cast(LoadEntry("glMapBufferRange", false)); + glVertexAttribIPointer = reinterpret_cast(LoadEntry("glVertexAttribIPointer", false)); + glVertexAttribLPointer = reinterpret_cast(LoadEntry("glVertexAttribLPointer", false)); #if defined(NAZARA_PLATFORM_WINDOWS) wglGetExtensionsStringARB = reinterpret_cast(LoadEntry("wglGetExtensionsStringARB", false)); @@ -2276,6 +2278,8 @@ PFNGLUSEPROGRAMPROC glUseProgram = nullptr; PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f = nullptr; PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor = nullptr; PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer = nullptr; +PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer = nullptr; +PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer = nullptr; PFNGLVIEWPORTPROC glViewport = nullptr; #if defined(NAZARA_PLATFORM_WINDOWS) PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat = nullptr;