summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
authorGravatarGravatar couriersud <couriersud@gmx.org>2019-11-26 00:58:31 +0100
committerGravatarGravatar couriersud <couriersud@gmx.org>2019-11-26 00:58:31 +0100
commit436381c96037a5f5500eae919f1733848d4b4be2 (patch)
tree8c69dcc96dc2ab77b84799954cd35a6418e9ad8a /src/osd
parent6c181d7adb16227621329ee687b5f0cf95b6336e (diff)
netlist: Revert development code committed by accident. (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/render/drawogl.cpp15
-rw-r--r--src/osd/sdl/window.cpp3
2 files changed, 2 insertions, 16 deletions
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index 1e9c32b7a86..0668834e19a 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -150,8 +150,7 @@ enum
TEXTURE_TYPE_SURFACE
};
-//#undef GL_TEXTURE_2D
-//#define GL_TEXTURE_2D GL_TEXTURE_2D_MULTISAMPLE
+
//============================================================
// MACROS
//============================================================
@@ -507,7 +506,7 @@ void renderer_ogl::initialize_gl()
if (strstr(extstr, "GL_EXT_framebuffer_object"))
{
- //m_usefbo = 1;
+ m_usefbo = 1;
if (!s_shown_video_info)
{
if(m_usefbo)
@@ -1124,21 +1123,11 @@ int renderer_ogl::draw(const int update)
GLsizei iScale = 1;
-#if 1
- glEnable(GL_FRAMEBUFFER_SRGB);
- glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
- glEnable(GL_LINE_SMOOTH);
- glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
- glEnable(GL_POLYGON_SMOOTH);
- glEnable(GL_MULTISAMPLE_ARB);
- glEnable(GL_MULTISAMPLE);
-#endif
/*
Mac hack: macOS version 10.15 and later flipped from assuming you don't support Retina to
assuming you do support Retina. SDL 2.0.11 is scheduled to fix this, but it's not out yet.
So we double-scale everything if you're on 10.15 or later and SDL is not at least version 2.0.11.
*/
-
#if defined(SDLMAME_MACOSX) || defined(OSD_MAC)
SDL_version sdlVers;
SDL_GetVersion(&sdlVers);
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index ac6ec74234f..2eeeebf1d49 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -704,9 +704,6 @@ int sdl_window_info::complete_create()
* SDL_GL_SetAttribute( SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1 );
*
*/
- SDL_GL_SetAttribute( SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1 );
- SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1);
- SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 16);
m_extra_flags = SDL_WINDOW_OPENGL;
}
else