summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/graphics.cpp1
-rw-r--r--src/render/renderers.cpp14
-rw-r--r--src/render/rendererslistsdl.h18
-rw-r--r--src/render/rendererslistsdl2.h18
-rw-r--r--src/render/rendertype.h3
5 files changed, 37 insertions, 17 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 44307add7..5bb90e753 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -303,6 +303,7 @@ bool Graphics::setOpenGLMode()
if (rectTex
&& OpenGLImageHelper::getInternalTextureType() == 4
&& getOpenGL() != RENDER_GLES_OPENGL
+ && getOpenGL() != RENDER_MODERN_OPENGL
&& config.getBoolValue("rectangulartextures")
&& !graphicsManager.isUseTextureSampler())
{
diff --git a/src/render/renderers.cpp b/src/render/renderers.cpp
index a26cb8b96..76aef6468 100644
--- a/src/render/renderers.cpp
+++ b/src/render/renderers.cpp
@@ -42,18 +42,24 @@ RenderType intToRenderType(const int mode)
if (mode != RENDER_SOFTWARE
#if defined(USE_OPENGL) && defined(ANDROID) && defined(USE_SDL2)
- && mode != RENDER_GLES_OPENGL && mode != RENDER_SDL2_DEFAULT)
+ && mode != RENDER_GLES_OPENGL
+ && mode != RENDER_SDL2_DEFAULT)
#elif defined(USE_OPENGL) && defined(ANDROID) && !defined(USE_SDL2)
&& mode != RENDER_GLES_OPENGL)
#elif defined(USE_OPENGL) && !defined(ANDROID) && defined(USE_SDL2)
- && mode != RENDER_NORMAL_OPENGL && mode != RENDER_SAFE_OPENGL
- && mode != RENDER_GLES_OPENGL && mode != RENDER_SDL2_DEFAULT)
+ && mode != RENDER_NORMAL_OPENGL
+ && mode != RENDER_MODERN_OPENGL
+ && mode != RENDER_SAFE_OPENGL
+ && mode != RENDER_GLES_OPENGL
+ && mode != RENDER_SDL2_DEFAULT)
#elif !defined(USE_OPENGL) && defined(USE_SDL2)
&& mode != RENDER_SDL2_DEFAULT)
#elif !defined(USE_OPENGL) && !defined(USE_SDL2)
)
#elif defined(USE_OPENGL) && !defined(ANDROID) && !defined(USE_SDL2)
- && mode != RENDER_NORMAL_OPENGL && mode != RENDER_SAFE_OPENGL
+ && mode != RENDER_NORMAL_OPENGL
+ && mode != RENDER_MODERN_OPENGL
+ && mode != RENDER_SAFE_OPENGL
&& mode != RENDER_GLES_OPENGL)
#endif
{
diff --git a/src/render/rendererslistsdl.h b/src/render/rendererslistsdl.h
index b2c3b2354..18960beda 100644
--- a/src/render/rendererslistsdl.h
+++ b/src/render/rendererslistsdl.h
@@ -57,7 +57,8 @@ const int renderToIndex[] =
1, // RENDER_NORMAL_OPENGL
1, // RENDER_SAFE_OPENGL
1, // RENDER_GLES_OPENGL
- 1 // RENDER_SDL2_DEFAULT
+ 1, // RENDER_SDL2_DEFAULT
+ 1 // RENDER_MODERN_OPENGL
};
#else // ANDROID
@@ -69,7 +70,8 @@ const RenderType indexToRender[] =
RENDER_SOFTWARE,
RENDER_NORMAL_OPENGL,
RENDER_SAFE_OPENGL,
- RENDER_GLES_OPENGL
+ RENDER_GLES_OPENGL,
+ RENDER_MODERN_OPENGL
};
const char *OPENGL_NAME[] =
@@ -81,10 +83,12 @@ const char *OPENGL_NAME[] =
// TRANSLATORS: draw backend
N_("Safe OpenGL"),
// TRANSLATORS: draw backend
- N_("Mobile OpenGL")
+ N_("Mobile OpenGL"),
+ // TRANSLATORS: draw backend
+ N_("Modern OpenGL")
};
-const int renderModesListSize = 4;
+const int renderModesListSize = 5;
const int renderToIndex[] =
{
@@ -92,7 +96,8 @@ const int renderToIndex[] =
1, // RENDER_NORMAL_OPENGL
2, // RENDER_SAFE_OPENGL
3, // RENDER_GLES_OPENGL
- 0 // RENDER_SDL2_DEFAULT
+ 0, // RENDER_SDL2_DEFAULT
+ 4 // RENDER_MODERN_OPENGL
};
#endif // ANDROID
@@ -120,7 +125,8 @@ const int renderToIndex[] =
0, // RENDER_NORMAL_OPENGL
0, // RENDER_SAFE_OPENGL
0, // RENDER_GLES_OPENGL
- 0 // RENDER_SDL2_DEFAULT
+ 0, // RENDER_SDL2_DEFAULT
+ 0 // RENDER_MODERN_OPENGL
};
#endif // USE_OPENGL
diff --git a/src/render/rendererslistsdl2.h b/src/render/rendererslistsdl2.h
index 1ebe4b242..2bb309f91 100644
--- a/src/render/rendererslistsdl2.h
+++ b/src/render/rendererslistsdl2.h
@@ -57,7 +57,8 @@ const int renderToIndex[] =
2, // RENDER_NORMAL_OPENGL
2, // RENDER_SAFE_OPENGL
2, // RENDER_GLES_OPENGL
- 1 // RENDER_SDL2_DEFAULT
+ 1, // RENDER_SDL2_DEFAULT
+ 2 // RENDER_MODERN_OPENGL
};
#else // ANDROID
@@ -70,7 +71,8 @@ const RenderType indexToRender[] =
RENDER_SDL2_DEFAULT,
RENDER_NORMAL_OPENGL,
RENDER_SAFE_OPENGL,
- RENDER_GLES_OPENGL
+ RENDER_GLES_OPENGL,
+ RENDER_MODERN_OPENGL
};
const char *OPENGL_NAME[] =
@@ -84,10 +86,12 @@ const char *OPENGL_NAME[] =
// TRANSLATORS: draw backend
N_("Safe OpenGL"),
// TRANSLATORS: draw backend
- N_("Mobile OpenGL")
+ N_("Mobile OpenGL"),
+ // TRANSLATORS: draw backend
+ N_("Modern OpenGL")
};
-const int renderModesListSize = 5;
+const int renderModesListSize = 6;
const int renderToIndex[] =
{
@@ -95,7 +99,8 @@ const int renderToIndex[] =
2, // RENDER_NORMAL_OPENGL
3, // RENDER_SAFE_OPENGL
4, // RENDER_GLES_OPENGL
- 1 // RENDER_SDL2_DEFAULT
+ 1, // RENDER_SDL2_DEFAULT
+ 5 // RENDER_MODERN_OPENGL
};
#endif // ANDROID
@@ -126,7 +131,8 @@ const int renderToIndex[] =
0, // RENDER_NORMAL_OPENGL
0, // RENDER_SAFE_OPENGL
0, // RENDER_GLES_OPENGL
- 1 // RENDER_SDL2_DEFAULT
+ 1, // RENDER_SDL2_DEFAULT
+ 0 // RENDER_MODERN_OPENGL
};
#endif // USE_OPENGL
diff --git a/src/render/rendertype.h b/src/render/rendertype.h
index cb4150188..cf8160c52 100644
--- a/src/render/rendertype.h
+++ b/src/render/rendertype.h
@@ -28,7 +28,8 @@ enum RenderType
RENDER_SAFE_OPENGL = 2,
RENDER_GLES_OPENGL = 3,
RENDER_SDL2_DEFAULT = 4,
- RENDER_NULL = 5,
+ RENDER_MODERN_OPENGL = 5,
+ RENDER_NULL = 6,
RENDER_LAST
};