claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-03-12 19:17:10 +01:00
parent 12269dedbf 8e72231b77
commit d406395935
3 changed files with 98 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qdarkstyle/dark/darkstyle.qss
View File

@@ -130,16 +130,6 @@ QStatusBar::item {
border: none;
}
QStatusBar QToolTip {
background-color: #666666;
border: 1px solid #272727;
color: #272727;
/* Remove padding, for fix combo box tooltip */
padding: 0px;
/* Reducing transparency to read better */
opacity: 230;
}
QStatusBar QLabel {
/* Fixes Spyder #9120, #9121 */
background: transparent;

2
src/qt/qt_main.cpp
View File

@@ -359,7 +359,7 @@ emu_LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
} else if (!(lpKdhs->flags & LLKHF_EXTENDED) && (lpKdhs->vkCode == 0x00000013)) {
/* Pause - send E1 1D. */
win_keyboard_handle(0xe1, 0, 0, 0);
win_keyboard_handle(0x1d, LLKHF_UP, 0, 0);
win_keyboard_handle(0x1d, lpKdhs->flags & LLKHF_UP, 0, 0);
}
} else if (!last && (lpKdhs->scanCode == 0x00000036))
/* Non-fake right shift. */

161
src/qt/qt_openglrenderer.cpp
View File

@@ -34,6 +34,7 @@ extern MainWindow* main_window;
#include <QEvent>
#include <QApplication>
#include <QString>
#include <QByteArray>
#include <QOpenGLContext>
#include <QOpenGLFunctions>
@@ -73,54 +74,74 @@ extern int video_vsync;
extern int video_focus_dim;
extern int video_refresh_rate;
const char *vertex_shader_default_tex_src = "#version 130\n"
"\n"
"in vec4 VertexCoord;\n"
"in vec2 TexCoord;\n"
"\n"
"out vec2 texCoord;\n"
"\n"
"void main()\n"
"{\n"
" gl_Position = VertexCoord;\n"
" texCoord = TexCoord;\n"
"}\n";
const char* vertex_shader_default_tex_src =
#ifdef __APPLE__
"#version 150\n"
#else
"#version 130\n"
#endif
"\n"
"in vec4 VertexCoord;\n"
"in vec2 TexCoord;\n"
"\n"
"out vec2 texCoord;\n"
"\n"
"void main()\n"
"{\n"
" gl_Position = VertexCoord;\n"
" texCoord = TexCoord;\n"
"}\n";
const char *fragment_shader_default_tex_src = "#version 130\n"
"\n"
"in vec2 texCoord;\n"
"uniform sampler2D Texture;\n"
"\n"
"out vec4 color;"
"\n"
"void main()\n"
"{\n"
" color = texture(Texture, texCoord);\n"
"}\n";
const char* fragment_shader_default_tex_src =
#ifdef __APPLE__
"#version 150\n"
#else
"#version 130\n"
#endif
"\n"
"in vec2 texCoord;\n"
"uniform sampler2D Texture;\n"
"\n"
"out vec4 color;"
"\n"
"void main()\n"
"{\n"
" color = texture(Texture, texCoord);\n"
"}\n";
const char *vertex_shader_default_color_src = "#version 130\n"
"\n"
"in vec4 VertexCoord;\n"
"in vec4 Color;\n"
"\n"
"out vec4 color;\n"
"\n"
"void main()\n"
"{\n"
" gl_Position = VertexCoord;\n"
" color = Color;\n"
"}\n";
const char* vertex_shader_default_color_src =
#ifdef __APPLE__
"#version 150\n"
#else
"#version 130\n"
#endif
"\n"
"in vec4 VertexCoord;\n"
"in vec4 Color;\n"
"\n"
"out vec4 color;\n"
"\n"
"void main()\n"
"{\n"
" gl_Position = VertexCoord;\n"
" color = Color;\n"
"}\n";
const char *fragment_shader_default_color_src = "#version 130\n"
"\n"
"in vec4 color;\n"
"\n"
"out vec4 outColor;"
"\n"
"void main()\n"
"{\n"
" outColor = color;\n"
"}\n";
const char* fragment_shader_default_color_src =
#ifdef __APPLE__
"#version 150\n"
#else
"#version 130\n"
#endif
"\n"
"in vec4 color;\n"
"\n"
"out vec4 outColor;"
"\n"
"void main()\n"
"{\n"
" outColor = color;\n"
"}\n";
static inline int
next_pow2(unsigned int n)
@@ -171,30 +192,32 @@ OpenGLRenderer::create_program(struct shader_program *program)
int
OpenGLRenderer::compile_shader(GLenum shader_type, const char *prepend, const char *program, int *dst)
{
const char *source[3];
QRegularExpression versionRegex("^\\s*(#version\\s+\\w+)", QRegularExpression::MultilineOption);
QString progSource = QString(program);
QByteArray finalSource = nullptr;
const char *source[5];
char version[50];
int ver = 0;
char *version_loc = (char *) strstr(program, "#version");
if (version_loc)
ver = (int) strtol(version_loc + 8, (char **) &program, 10);
else {
ver = glsl_version[0] * 100 + glsl_version[1] * 10;
if (ver == 300)
ver = 130;
else if (ver == 310)
ver = 140;
else if (ver == 320)
ver = 150;
if (version_loc) {
snprintf(version, 49, "%s\n", versionRegex.match(progSource).captured(1).toLatin1().data());
progSource.remove(versionRegex);
} else {
snprintf(version, 49, "%s\n", this->glslVersion.toLatin1().data());
}
sprintf(version, "#version %d\n", ver);
source[0] = version;
source[1] = prepend ? prepend : "";
source[2] = program;
/* Remove parameter lines. */
progSource.remove(QRegularExpression("^\\s*#pragma parameter.*?\\n", QRegularExpression::MultilineOption));
pclog("GLSL version %d\n", ver);
finalSource = progSource.toLatin1();
source[0] = version;
source[1] = "\n#extension GL_ARB_shading_language_420pack : enable\n";
source[2] = prepend ? prepend : "";
source[3] = "\n#line 1\n";
source[4] = finalSource.data();
GLuint shader = glw.glCreateShader(shader_type);
glw.glShaderSource(shader, 3, source, NULL);
glw.glShaderSource(shader, 5, source, NULL);
glw.glCompileShader(shader);
GLint status = 0;
@@ -805,6 +828,7 @@ OpenGLRenderer::OpenGLRenderer(QWidget *parent)
source.setRect(0, 0, 100, 100);
isInitialized = false;
isFinalized = false;
context = nullptr;
}
OpenGLRenderer::~OpenGLRenderer() { finalize(); }
@@ -840,6 +864,15 @@ OpenGLRenderer::initialize()
pclog("Using OpenGL %s\n", glw.glGetString(GL_VERSION));
pclog("Using Shading Language %s\n", glw.glGetString(GL_SHADING_LANGUAGE_VERSION));
glslVersion = reinterpret_cast<const char *>(glw.glGetString(GL_SHADING_LANGUAGE_VERSION));
glslVersion.truncate(4);
glslVersion.remove('.');
glslVersion.prepend("#version ");
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES)
glslVersion.append(" es");
else if (context->format().profile() == QSurfaceFormat::CoreProfile)
glslVersion.append(" core");
glw.glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
pclog("Max texture size: %dx%d\n", max_texture_size, max_texture_size);
@@ -1075,7 +1108,7 @@ OpenGLRenderer::initialize()
void
OpenGLRenderer::finalize()
{
if (isFinalized)
if (isFinalized || !context)
return;
context->makeCurrent(this);