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

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

Browse Source
This commit is contained in:
OBattler
2025-03-10 21:31:42 +01:00
parent ebfa4f7cac df5cc9b038
commit cd44cad32e
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/chipset/via_pipc.c
View File

@@ -61,6 +61,7 @@
#define VIA_PIPC_586B 0x05864700 #define VIA_PIPC_586B 0x05864700
#define VIA_PIPC_596A 0x05960900 #define VIA_PIPC_596A 0x05960900
#define VIA_PIPC_596B 0x05962300 #define VIA_PIPC_596B 0x05962300
#define VIA_PIPC_596 0x0596
#define VIA_PIPC_686A 0x06861400 #define VIA_PIPC_686A 0x06861400
#define VIA_PIPC_686B 0x06864000 #define VIA_PIPC_686B 0x06864000
#define VIA_PIPC_8231 0x82311000 #define VIA_PIPC_8231 0x82311000
@@ -413,7 +414,7 @@ pipc_reset_hard(void *priv)
dev->power_regs[0x34] = 0x68; dev->power_regs[0x34] = 0x68;
dev->power_regs[0x40] = 0x20; dev->power_regs[0x40] = 0x20;
dev->power_regs[0x42] = 0x00; dev->power_regs[0x42] = ((dev->local >> 16) == VIA_PIPC_596) ? 0x50 : 0x00;
acpi_set_irq_line(dev->acpi, 0x00); acpi_set_irq_line(dev->acpi, 0x00);
dev->power_regs[0x48] = 0x01; dev->power_regs[0x48] = 0x01;
@@ -1595,7 +1596,7 @@ pipc_reset(void *priv)
pipc_write(pm_func, 0x48, 0x01, priv); pipc_write(pm_func, 0x48, 0x01, priv);
pipc_write(pm_func, 0x49, 0x00, priv); pipc_write(pm_func, 0x49, 0x00, priv);
dev->power_regs[0x42] = 0x00; dev->power_regs[0x42] = ((dev->local >> 16) == VIA_PIPC_596) ? 0x50 : 0x00;
acpi_set_irq_line(dev->acpi, 0x00); acpi_set_irq_line(dev->acpi, 0x00);
pipc_write(1, 0x04, 0x80, priv); pipc_write(1, 0x04, 0x80, priv);

16
src/qt/qt_openglrenderer.cpp
View File

@@ -1103,14 +1103,6 @@ OpenGLRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
context->makeCurrent(this); context->makeCurrent(this);
#ifdef Q_OS_MACOS
glViewport(
destination.x() * devicePixelRatio(),
destination.y() * devicePixelRatio(),
destination.width() * devicePixelRatio(),
destination.height() * devicePixelRatio());
#endif
if (source.width() != w || source.height() != h) { if (source.width() != w || source.height() != h) {
glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id); glw.glBindTexture(GL_TEXTURE_2D, scene_texture.id);
glw.glTexImage2D(GL_TEXTURE_2D, 0, (GLenum) QOpenGLTexture::RGBA8_UNorm, w, h, 0, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, NULL); glw.glTexImage2D(GL_TEXTURE_2D, 0, (GLenum) QOpenGLTexture::RGBA8_UNorm, w, h, 0, (GLenum) QOpenGLTexture::BGRA, (GLenum) QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
@@ -1129,6 +1121,14 @@ OpenGLRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
source.setRect(x, y, w, h); source.setRect(x, y, w, h);
onResize(this->width(), this->height()); onResize(this->width(), this->height());
#ifdef Q_OS_MACOS
glw.glViewport(
destination.x() * devicePixelRatio(),
destination.y() * devicePixelRatio(),
destination.width() * devicePixelRatio(),
destination.height() * devicePixelRatio());
#endif
if (video_framerate == -1) if (video_framerate == -1)
render(); render();
} }

4
src/qt/qt_openglshadermanagerdialog.cpp
View File

@@ -46,7 +46,7 @@ OpenGLShaderManagerDialog::OpenGLShaderManagerDialog(QWidget *parent)
QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget); QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget);
item->setText(filename); item->setText(filename);
item->setData(Qt::UserRole + 1, QString(gl3_shader_file[i])); item->setData(Qt::UserRole + 1, QString(gl3_shader_file[i]));
item->setData(Qt::UserRole + 2, (uintptr_t)shaderfile); item->setData(Qt::UserRole + 2, (qulonglong)(uintptr_t)shaderfile);
} }
} }
} }
@@ -174,7 +174,7 @@ void OpenGLShaderManagerDialog::on_buttonAdd_clicked()
QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget); QListWidgetItem* item = new QListWidgetItem(ui->shaderListWidget);
item->setText(filename); item->setText(filename);
item->setData(Qt::UserRole + 1, res); item->setData(Qt::UserRole + 1, res);
item->setData(Qt::UserRole + 2, (uintptr_t)shaderfile); item->setData(Qt::UserRole + 2, (qulonglong)(uintptr_t)shaderfile);
if (ui->shaderListWidget->count()) { if (ui->shaderListWidget->count()) {
ui->shaderListWidget->setCurrentRow(ui->shaderListWidget->count() - 1); ui->shaderListWidget->setCurrentRow(ui->shaderListWidget->count() - 1);
} }

2
src/qt/qt_platform.cpp
View File

@@ -368,6 +368,8 @@ plat_mmap(size_t size, uint8_t executable)
void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE | (executable ? MAP_JIT : 0), -1, 0); void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE | (executable ? MAP_JIT : 0), -1, 0);
# elif defined(PROT_MPROTECT) # elif defined(PROT_MPROTECT)
void *ret = mmap(0, size, PROT_MPROTECT(PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0)), MAP_ANON | MAP_PRIVATE, -1, 0); void *ret = mmap(0, size, PROT_MPROTECT(PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0)), MAP_ANON | MAP_PRIVATE, -1, 0);
if (ret)
mprotect(ret, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0));
# else # else
void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0); void *ret = mmap(0, size, PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0), MAP_ANON | MAP_PRIVATE, -1, 0);
# endif # endif