2013-04-09 13:31:46 +00:00
|
|
|
#include "opengl/opengl.hpp"
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2013-07-29 09:42:45 +00:00
|
|
|
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
|
|
|
|
#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
|
|
|
|
|
2015-11-08 08:54:42 +00:00
|
|
|
auto VideoGLX_X11ErrorHandler(Display*, XErrorEvent*) -> int {
|
|
|
|
return 0; //suppress errors
|
|
|
|
}
|
|
|
|
|
2015-06-20 05:44:05 +00:00
|
|
|
struct VideoGLX : Video, OpenGL {
|
2017-07-24 05:23:40 +00:00
|
|
|
VideoGLX() { initialize(); }
|
|
|
|
~VideoGLX() { terminate(); }
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto ready() -> bool { return _ready; }
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto context() -> uintptr { return _context; }
|
|
|
|
auto blocking() -> bool { return _blocking; }
|
|
|
|
auto depth() -> uint { return _depth; }
|
|
|
|
auto smooth() -> bool { return _smooth; }
|
|
|
|
auto shader() -> string { return _shader; }
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto setContext(uintptr context) -> bool {
|
|
|
|
if(_context == context) return true;
|
|
|
|
_context = context;
|
|
|
|
return initialize();
|
|
|
|
}
|
2012-03-10 12:37:36 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto setBlocking(bool blocking) -> bool {
|
|
|
|
if(_blocking == blocking) return true;
|
|
|
|
_blocking = blocking;
|
|
|
|
if(glXSwapInterval) glXSwapInterval(_blocking);
|
|
|
|
return true;
|
|
|
|
}
|
2012-03-10 12:37:36 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto setDepth(uint depth) -> bool {
|
|
|
|
if(_depth == depth) return true;
|
|
|
|
switch(depth) {
|
|
|
|
case 24: _depth = depth; OpenGL::inputFormat = GL_RGBA8; return true;
|
|
|
|
case 30: _depth = depth; OpenGL::inputFormat = GL_RGB10_A2; return true;
|
|
|
|
default: return false;
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
}
|
2017-07-24 05:23:40 +00:00
|
|
|
}
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto setSmooth(bool smooth) -> bool {
|
|
|
|
if(_smooth == smooth) return true;
|
|
|
|
_smooth = smooth;
|
|
|
|
if(!_shader) OpenGL::filter = _smooth ? GL_LINEAR : GL_NEAREST;
|
|
|
|
return true;
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto setShader(string shader) -> bool {
|
|
|
|
if(_shader == shader) return true;
|
|
|
|
OpenGL::shader(_shader = shader);
|
|
|
|
if(!_shader) OpenGL::filter = _smooth ? GL_LINEAR : GL_NEAREST;
|
|
|
|
return true;
|
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto clear() -> void {
|
|
|
|
if(!ready()) return;
|
|
|
|
OpenGL::clear();
|
|
|
|
if(_doubleBuffer) glXSwapBuffers(_display, _glXWindow);
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto lock(uint32_t*& data, uint& pitch, uint width, uint height) -> bool {
|
|
|
|
if(!ready()) return false;
|
2013-04-09 13:31:46 +00:00
|
|
|
OpenGL::size(width, height);
|
2010-08-09 13:28:56 +00:00
|
|
|
return OpenGL::lock(data, pitch);
|
|
|
|
}
|
|
|
|
|
Update to v094r23 release.
byuu says:
The library window is gone, and replaced with
hiro::BrowserWindow::openFolder(). This gives navigation capabilities to
game loading, and it also completes our slotted cart selection code. As
an added bonus, it's less code this way, too.
I also set the window size to consistent sizes between all emulated
systems, so that switching between SFC and GB don't cause the window
size to keep changing, and so that the scaling size is consistent (eg at
normal scale, GB @ 3x is closer to SNES @ 2x.) This means black borders
in GB/GBA mode, but it doesn't look that bad, and it's not like many
people ever use these modes anyway.
Finally, added the placeholder tabs for video, audio and timing. I don't
intend to add the timing calculator code to v095 (it might be better as
a separate tool), but I'll add the ability to set video/audio rates, at
least.
Glitch 1: despite selecting the first item in the BrowserDialog list, if
you press enter when the window appears, it doesn't activate the item
until you press an arrow key first.
Glitch 2: in Game Boy mode, if you set the 4x window size, it's not
honoring the full requested height because the viewport is smaller than
the window. 8+ years of trying to get GTK+ and Qt to simply set the god
damned window size I ask for, and I still can't get them to do it
reliably.
Remaining issues:
- finish configuration panels (video, audio, timing)
- fix ruby driver compilation on Windows
- add DIP switch selection window (NSS) [I may end up punting this one
to v096]
2015-05-30 11:39:09 +00:00
|
|
|
auto unlock() -> void {
|
2017-07-24 05:23:40 +00:00
|
|
|
if(!ready()) return;
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto output() -> void {
|
|
|
|
if(!ready()) return;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
|
|
|
//we must ensure that the child window is the same size as the parent window.
|
|
|
|
//unfortunately, we cannot hook the parent window resize event notification,
|
|
|
|
//as we did not create the parent window, nor have any knowledge of the toolkit used.
|
|
|
|
//therefore, inelegant as it may be, we query each window size and resize as needed.
|
|
|
|
XWindowAttributes parent, child;
|
2017-07-24 05:23:40 +00:00
|
|
|
XGetWindowAttributes(_display, (Window)_context, &parent);
|
|
|
|
XGetWindowAttributes(_display, (Window)_window, &child);
|
2010-08-09 13:28:56 +00:00
|
|
|
if(child.width != parent.width || child.height != parent.height) {
|
2017-07-24 05:23:40 +00:00
|
|
|
XResizeWindow(_display, _window, parent.width, parent.height);
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
OpenGL::outputWidth = parent.width;
|
|
|
|
OpenGL::outputHeight = parent.height;
|
|
|
|
OpenGL::output();
|
|
|
|
if(_doubleBuffer) glXSwapBuffers(_display, _glXWindow);
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
private:
|
|
|
|
auto initialize() -> bool {
|
|
|
|
terminate();
|
|
|
|
if(!_context) return false;
|
|
|
|
|
|
|
|
_display = XOpenDisplay(nullptr);
|
|
|
|
_screen = DefaultScreen(_display);
|
Update to v094r23 release.
byuu says:
The library window is gone, and replaced with
hiro::BrowserWindow::openFolder(). This gives navigation capabilities to
game loading, and it also completes our slotted cart selection code. As
an added bonus, it's less code this way, too.
I also set the window size to consistent sizes between all emulated
systems, so that switching between SFC and GB don't cause the window
size to keep changing, and so that the scaling size is consistent (eg at
normal scale, GB @ 3x is closer to SNES @ 2x.) This means black borders
in GB/GBA mode, but it doesn't look that bad, and it's not like many
people ever use these modes anyway.
Finally, added the placeholder tabs for video, audio and timing. I don't
intend to add the timing calculator code to v095 (it might be better as
a separate tool), but I'll add the ability to set video/audio rates, at
least.
Glitch 1: despite selecting the first item in the BrowserDialog list, if
you press enter when the window appears, it doesn't activate the item
until you press an arrow key first.
Glitch 2: in Game Boy mode, if you set the 4x window size, it's not
honoring the full requested height because the viewport is smaller than
the window. 8+ years of trying to get GTK+ and Qt to simply set the god
damned window size I ask for, and I still can't get them to do it
reliably.
Remaining issues:
- finish configuration panels (video, audio, timing)
- fix ruby driver compilation on Windows
- add DIP switch selection window (NSS) [I may end up punting this one
to v096]
2015-05-30 11:39:09 +00:00
|
|
|
|
2010-08-09 13:28:56 +00:00
|
|
|
//require GLX 1.2+ API
|
2017-07-24 05:23:40 +00:00
|
|
|
glXQueryVersion(_display, &_versionMajor, &_versionMinor);
|
|
|
|
if(_versionMajor < 1 || (_versionMajor == 1 && _versionMinor < 2)) return false;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2015-11-08 08:54:42 +00:00
|
|
|
XWindowAttributes windowAttributes;
|
2017-07-24 05:23:40 +00:00
|
|
|
XGetWindowAttributes(_display, (Window)_context, &windowAttributes);
|
2010-08-09 13:28:56 +00:00
|
|
|
|
|
|
|
//let GLX determine the best Visual to use for GL output; provide a few hints
|
|
|
|
//note: some video drivers will override double buffering attribute
|
2017-07-24 05:23:40 +00:00
|
|
|
int attributeList[] = {
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
|
|
|
|
GLX_RENDER_TYPE, GLX_RGBA_BIT,
|
|
|
|
GLX_DOUBLEBUFFER, True,
|
2017-07-24 05:23:40 +00:00
|
|
|
GLX_RED_SIZE, (int)(_depth / 3),
|
|
|
|
GLX_GREEN_SIZE, (int)(_depth / 3) + (int)(_depth % 3),
|
|
|
|
GLX_BLUE_SIZE, (int)(_depth / 3),
|
2013-07-29 09:42:45 +00:00
|
|
|
None
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
};
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
int fbCount = 0;
|
|
|
|
GLXFBConfig* fbConfig = glXChooseFBConfig(_display, _screen, attributeList, &fbCount);
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
if(fbCount == 0) return false;
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
XVisualInfo* vi = glXGetVisualFromFBConfig(_display, fbConfig[0]);
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
//(Window)_context has already been realized, most likely with DefaultVisual.
|
2010-08-09 13:28:56 +00:00
|
|
|
//GLX requires that the GL output window has the same Visual as the GLX context.
|
|
|
|
//it is not possible to change the Visual of an already realized (created) window.
|
2017-07-24 05:23:40 +00:00
|
|
|
//therefore a new child window, using the same GLX Visual, must be created and binded to it.
|
|
|
|
_colormap = XCreateColormap(_display, RootWindow(_display, vi->screen), vi->visual, AllocNone);
|
2010-08-09 13:28:56 +00:00
|
|
|
XSetWindowAttributes attributes;
|
2017-07-24 05:23:40 +00:00
|
|
|
attributes.colormap = _colormap;
|
2010-08-09 13:28:56 +00:00
|
|
|
attributes.border_pixel = 0;
|
2017-07-24 05:23:40 +00:00
|
|
|
_window = XCreateWindow(_display, /* parent = */ (Window)_context,
|
2015-11-08 08:54:42 +00:00
|
|
|
/* x = */ 0, /* y = */ 0, windowAttributes.width, windowAttributes.height,
|
2010-08-09 13:28:56 +00:00
|
|
|
/* border_width = */ 0, vi->depth, InputOutput, vi->visual,
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
CWColormap | CWBorderPixel, &attributes);
|
2017-07-24 05:23:40 +00:00
|
|
|
XSetWindowBackground(_display, _window, /* color = */ 0);
|
|
|
|
XMapWindow(_display, _window);
|
|
|
|
XFlush(_display);
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
|
2010-08-09 13:28:56 +00:00
|
|
|
//window must be realized (appear onscreen) before we make the context current
|
2017-07-24 05:23:40 +00:00
|
|
|
while(XPending(_display)) {
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
XEvent event;
|
2017-07-24 05:23:40 +00:00
|
|
|
XNextEvent(_display, &event);
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
}
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
_glXContext = glXCreateContext(_display, vi, /* sharelist = */ 0, /* direct = */ GL_TRUE);
|
|
|
|
glXMakeCurrent(_display, _glXWindow = _window, _glXContext);
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2015-11-08 08:54:42 +00:00
|
|
|
//glXSwapInterval is used to toggle Vsync
|
|
|
|
//note that the ordering is very important! MESA declares SGI, but the SGI function does nothing
|
2017-07-24 05:23:40 +00:00
|
|
|
if(!glXSwapInterval) glXSwapInterval = (int (*)(int))glGetProcAddress("glXSwapIntervalMESA");
|
|
|
|
if(!glXSwapInterval) glXSwapInterval = (int (*)(int))glGetProcAddress("glXSwapIntervalSGI");
|
2013-07-29 09:42:45 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(auto glXCreateContextAttribs = (auto (*)(Display*, GLXFBConfig, GLXContext, int, const int*) -> GLXContext)glGetProcAddress("glXCreateContextAttribsARB")) {
|
|
|
|
int attributes[] = {
|
2013-07-29 09:42:45 +00:00
|
|
|
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
|
|
|
|
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
|
|
|
|
None
|
|
|
|
};
|
2015-11-08 08:54:42 +00:00
|
|
|
|
|
|
|
//glXCreateContextAttribs tends to throw BadRequest errors instead of simply failing gracefully
|
|
|
|
auto originalHandler = XSetErrorHandler(VideoGLX_X11ErrorHandler);
|
2017-07-24 05:23:40 +00:00
|
|
|
auto context = glXCreateContextAttribs(_display, fbConfig[0], nullptr, true, attributes);
|
|
|
|
XSync(_display, False);
|
2015-11-08 08:54:42 +00:00
|
|
|
XSetErrorHandler(originalHandler);
|
|
|
|
|
2013-07-29 09:42:45 +00:00
|
|
|
if(context) {
|
2017-07-24 05:23:40 +00:00
|
|
|
glXMakeCurrent(_display, 0, nullptr);
|
|
|
|
glXDestroyContext(_display, _glXContext);
|
|
|
|
glXMakeCurrent(_display, _glXWindow, _glXContext = context);
|
2015-11-08 08:54:42 +00:00
|
|
|
} else {
|
|
|
|
//OpenGL 3.2+ not supported (most likely OpenGL 2.x)
|
|
|
|
return false;
|
2013-07-29 09:42:45 +00:00
|
|
|
}
|
2015-11-08 08:54:42 +00:00
|
|
|
} else {
|
|
|
|
//missing required glXCreateContextAtribs function
|
|
|
|
return false;
|
2013-07-29 09:42:45 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(glXSwapInterval) glXSwapInterval(_blocking);
|
2013-07-29 09:42:45 +00:00
|
|
|
|
2010-08-09 13:28:56 +00:00
|
|
|
//read attributes of frame buffer for later use, as requested attributes from above are not always granted
|
2017-07-24 05:23:40 +00:00
|
|
|
int value = 0;
|
|
|
|
glXGetConfig(_display, vi, GLX_DOUBLEBUFFER, &value);
|
|
|
|
_doubleBuffer = value;
|
|
|
|
_isDirect = glXIsDirect(_display, _glXContext);
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
return _ready = OpenGL::initialize();
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
auto terminate() -> void {
|
|
|
|
_ready = false;
|
|
|
|
OpenGL::terminate();
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(_glXContext) {
|
|
|
|
glXDestroyContext(_display, _glXContext);
|
|
|
|
_glXContext = nullptr;
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(_window) {
|
|
|
|
XUnmapWindow(_display, _window);
|
|
|
|
_window = 0;
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(_colormap) {
|
|
|
|
XFreeColormap(_display, _colormap);
|
|
|
|
_colormap = 0;
|
2010-08-09 13:28:56 +00:00
|
|
|
}
|
|
|
|
|
2017-07-24 05:23:40 +00:00
|
|
|
if(_display) {
|
|
|
|
XCloseDisplay(_display);
|
|
|
|
_display = nullptr;
|
Update to v094r23 release.
byuu says:
The library window is gone, and replaced with
hiro::BrowserWindow::openFolder(). This gives navigation capabilities to
game loading, and it also completes our slotted cart selection code. As
an added bonus, it's less code this way, too.
I also set the window size to consistent sizes between all emulated
systems, so that switching between SFC and GB don't cause the window
size to keep changing, and so that the scaling size is consistent (eg at
normal scale, GB @ 3x is closer to SNES @ 2x.) This means black borders
in GB/GBA mode, but it doesn't look that bad, and it's not like many
people ever use these modes anyway.
Finally, added the placeholder tabs for video, audio and timing. I don't
intend to add the timing calculator code to v095 (it might be better as
a separate tool), but I'll add the ability to set video/audio rates, at
least.
Glitch 1: despite selecting the first item in the BrowserDialog list, if
you press enter when the window appears, it doesn't activate the item
until you press an arrow key first.
Glitch 2: in Game Boy mode, if you set the 4x window size, it's not
honoring the full requested height because the viewport is smaller than
the window. 8+ years of trying to get GTK+ and Qt to simply set the god
damned window size I ask for, and I still can't get them to do it
reliably.
Remaining issues:
- finish configuration panels (video, audio, timing)
- fix ruby driver compilation on Windows
- add DIP switch selection window (NSS) [I may end up punting this one
to v096]
2015-05-30 11:39:09 +00:00
|
|
|
}
|
2012-03-10 12:37:36 +00:00
|
|
|
}
|
2017-07-24 05:23:40 +00:00
|
|
|
|
|
|
|
bool _ready = false;
|
|
|
|
uintptr _context = 0;
|
|
|
|
bool _blocking = false;
|
|
|
|
uint _depth = 24;
|
|
|
|
bool _smooth = true;
|
|
|
|
string _shader;
|
|
|
|
|
|
|
|
auto (*glXSwapInterval)(int) -> int = nullptr;
|
|
|
|
|
|
|
|
Display* _display = nullptr;
|
|
|
|
int _screen = 0;
|
|
|
|
Window _window = 0;
|
|
|
|
Colormap _colormap = 0;
|
|
|
|
GLXContext _glXContext = nullptr;
|
|
|
|
GLXWindow _glXWindow = 0;
|
|
|
|
|
|
|
|
int _versionMajor = 0;
|
|
|
|
int _versionMinor = 0;
|
|
|
|
bool _doubleBuffer = false;
|
|
|
|
bool _isDirect = false;
|
2010-08-09 13:28:56 +00:00
|
|
|
};
|