Merge branch 'nazara-next' into graphics-next

This commit is contained in:
Jérôme Leclercq
2021-01-28 16:37:46 +01:00
23 changed files with 215 additions and 157 deletions

View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/Enums.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
#include <optional>
#include <string>
@@ -39,7 +39,7 @@ namespace Nz
inline GLenum ToOpenGL(GL::BufferTarget bufferTarget);
inline GLenum ToOpenGL(GL::TextureTarget bufferTarget);
//NAZARA_OPENGLRENDERER_API std::string TranslateOpenGLError(GLenum code);
NAZARA_OPENGLRENDERER_API std::string TranslateOpenGLError(GLenum code);
}
#include <Nazara/OpenGLRenderer/Utils.inl>