summaryrefslogtreecommitdiff
path: root/src/render/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/opengl')
-rw-r--r--src/render/opengl/mgl.cpp6
-rw-r--r--src/render/opengl/mgl.h6
-rw-r--r--src/render/opengl/mgl.hpp6
-rw-r--r--src/render/opengl/mglcheck.h6
-rw-r--r--src/render/opengl/mgldefines.h6
-rw-r--r--src/render/opengl/mglemu.cpp6
-rw-r--r--src/render/opengl/mglemu.h6
-rw-r--r--src/render/opengl/mglfunctions.h12
-rw-r--r--src/render/opengl/mgltypes.h22
-rw-r--r--src/render/opengl/naclglfunctions.h6
-rw-r--r--src/render/opengl/opengldebug.h6
11 files changed, 40 insertions, 48 deletions
diff --git a/src/render/opengl/mgl.cpp b/src/render/opengl/mgl.cpp
index 521f35ef7..d74b90e2e 100644
--- a/src/render/opengl/mgl.cpp
+++ b/src/render/opengl/mgl.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mgl.h b/src/render/opengl/mgl.h
index 5c3bd8c1a..c38b10f21 100644
--- a/src/render/opengl/mgl.h
+++ b/src/render/opengl/mgl.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mgl.hpp b/src/render/opengl/mgl.hpp
index 6f4e7d505..4599c3855 100644
--- a/src/render/opengl/mgl.hpp
+++ b/src/render/opengl/mgl.hpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -140,6 +140,6 @@ defName(glTextureSubImage2D);
defName(glTextureSubImage2DEXT);
defName(glClearTexImage);
defName(glClearTexSubImage);
-#ifdef WIN32
+#ifdef _WIN32
defName(wglGetExtensionsString);
-#endif
+#endif // _WIN32
diff --git a/src/render/opengl/mglcheck.h b/src/render/opengl/mglcheck.h
index 98ba0fd3e..c4b0ca640 100644
--- a/src/render/opengl/mglcheck.h
+++ b/src/render/opengl/mglcheck.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mgldefines.h b/src/render/opengl/mgldefines.h
index dd2b3f7a1..b27f7441e 100644
--- a/src/render/opengl/mgldefines.h
+++ b/src/render/opengl/mgldefines.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mglemu.cpp b/src/render/opengl/mglemu.cpp
index 5424d5e18..05510f8f9 100644
--- a/src/render/opengl/mglemu.cpp
+++ b/src/render/opengl/mglemu.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2014-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mglemu.h b/src/render/opengl/mglemu.h
index 7ce6d640c..0b955f27c 100644
--- a/src/render/opengl/mglemu.h
+++ b/src/render/opengl/mglemu.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2014-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/mglfunctions.h b/src/render/opengl/mglfunctions.h
index e3627be32..dfc31718b 100644
--- a/src/render/opengl/mglfunctions.h
+++ b/src/render/opengl/mglfunctions.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
LOGGER_H
-#ifdef WIN32
+#ifdef _WIN32
#define getFunction(name) wglGetProcAddress(name)
#elif defined ANDROID
#define getFunction(name) eglGetProcAddress(name)
@@ -38,10 +38,10 @@ LOGGER_H
#define getFunction(name) glGetProcAddressREGAL(name)
#elif defined(__SWITCH__)
#define getFunction(name) SDL_GL_GetProcAddress(name)
-#else // WIN32
+#else // _WIN32
#define getFunction(name) glXGetProcAddress(\
reinterpret_cast<const GLubyte*>(name))
-#endif // WIN32
+#endif // _WIN32
#define assignFunction(func) \
{ \
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 3ea8cff45..e3954aa1b 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -72,15 +72,7 @@ PRAGMA45(GCC diagnostic pop)
RENDER_OPENGL_MGLDEFINES_H
#ifndef USE_SDL2
-#if defined(__GXX_EXPERIMENTAL_CXX0X__)
-#if defined(__APPLE__)
-#include <tr1/cstdint>
-#else // defined(__APPLE__)
-#include <cstdint>
-#endif // defined(__APPLE__)
-#else // defined(__GXX_EXPERIMENTAL_CXX0X__)
-#include <stdint.h>
-#endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
+#include <stdint.h> // see commit's discussion
#endif // USE_SDL2
typedef void (APIENTRY *glGenRenderbuffers_t)(GLsizei, GLuint *);
@@ -239,11 +231,11 @@ typedef void (APIENTRY *glDebugMessageCallback_t) (GLDEBUGPROC_t callback,
const void *userParam);
-#ifdef WIN32
+#ifdef _WIN32
typedef const char* (APIENTRY * wglGetExtensionsString_t) (HDC hdc);
-#else // WIN32
+#else // _WIN32
#define CALLBACK
-#endif // WIN32
+#endif // _WIN32
#endif // USE_OPENGL
#endif // RENDER_OPENGL_MGLTYPES_H
diff --git a/src/render/opengl/naclglfunctions.h b/src/render/opengl/naclglfunctions.h
index ef0f139e8..d0e5ffc83 100644
--- a/src/render/opengl/naclglfunctions.h
+++ b/src/render/opengl/naclglfunctions.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2014-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/render/opengl/opengldebug.h b/src/render/opengl/opengldebug.h
index 9ae90fdcb..b9cee0d43 100644
--- a/src/render/opengl/opengldebug.h
+++ b/src/render/opengl/opengldebug.h
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2014-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse Developers
+ * Copyright (C) 2020-2025 The ManaVerse Developers
*
- * This file is part of The ManaPlus Client.
+ * This file is part of The ManaVerse Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by