80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2023-08-11 22:30:02 +02:00
parent 2391c11260 d4cd4ced54
commit b2883df0d0
8 changed files with 387 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/machine/m_at_misc.c
View File

@@ -1,74 +1,74 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.
* *
* This file is part of the 86Box distribution. * This file is part of the 86Box distribution.
* *
* Implementation of Miscellaneous, Fake, Hypervisor machines. * Implementation of Miscellaneous, Fake, Hypervisor machines.
* *
* *
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016-2019 Miran Grca. * Copyright 2016-2019 Miran Grca.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/mem.h> #include <86box/mem.h>
#include <86box/io.h> #include <86box/io.h>
#include <86box/rom.h> #include <86box/rom.h>
#include <86box/pci.h> #include <86box/pci.h>
#include <86box/device.h> #include <86box/device.h>
#include <86box/chipset.h> #include <86box/chipset.h>
#include <86box/hdc.h> #include <86box/hdc.h>
#include <86box/hdc_ide.h> #include <86box/hdc_ide.h>
#include <86box/keyboard.h> #include <86box/keyboard.h>
#include <86box/flash.h> #include <86box/flash.h>
#include <86box/sio.h> #include <86box/sio.h>
#include <86box/hwm.h> #include <86box/hwm.h>
#include <86box/spd.h> #include <86box/spd.h>
#include <86box/video.h> #include <86box/video.h>
#include "cpu.h" #include "cpu.h"
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/sound.h> #include <86box/sound.h>
int int
machine_at_vpc2007_init(const machine_t *model) machine_at_vpc2007_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/vpc2007/13500.bin", ret = bios_load_linear("roms/machines/vpc2007/13500.bin",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
machine_at_common_init_ex(model, 2); machine_at_common_init_ex(model, 2);
is_vpc = 1; is_vpc = 1;
pci_init(PCI_CONFIG_TYPE_1); pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0A, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
device_add(&i440bx_no_agp_device); device_add(&i440bx_no_agp_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add(&w83977f_370_device); device_add(&w83977f_370_device);
device_add(&keyboard_ps2_ami_pci_device); device_add(&keyboard_ps2_ami_pci_device);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 256); /* real VPC provides invalid SPD data */ spd_register(SPD_TYPE_SDRAM, 0xF, 256); /* real VPC provides invalid SPD data */
return ret; return ret;
} }

306
src/machine/m_at_slot2.c
View File

@@ -1,153 +1,153 @@
/* /*
* 86Box A hypervisor and IBM PC system emulator that specializes in * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM * running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent * PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus. * system designs based on the PCI bus.
* *
* This file is part of the 86Box distribution. * This file is part of the 86Box distribution.
* *
* Implementation of Slot 2 machines. * Implementation of Slot 2 machines.
* *
* Slot 2 is quite a rare type of Slot. Used mostly by Pentium II & III Xeons * Slot 2 is quite a rare type of Slot. Used mostly by Pentium II & III Xeons
* *
* *
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016-2019 Miran Grca. * Copyright 2016-2019 Miran Grca.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/mem.h> #include <86box/mem.h>
#include <86box/io.h> #include <86box/io.h>
#include <86box/rom.h> #include <86box/rom.h>
#include <86box/pci.h> #include <86box/pci.h>
#include <86box/device.h> #include <86box/device.h>
#include <86box/chipset.h> #include <86box/chipset.h>
#include <86box/hdc.h> #include <86box/hdc.h>
#include <86box/hdc_ide.h> #include <86box/hdc_ide.h>
#include <86box/keyboard.h> #include <86box/keyboard.h>
#include <86box/flash.h> #include <86box/flash.h>
#include <86box/sio.h> #include <86box/sio.h>
#include <86box/hwm.h> #include <86box/hwm.h>
#include <86box/spd.h> #include <86box/spd.h>
#include <86box/video.h> #include <86box/video.h>
#include <86box/clock.h> #include <86box/clock.h>
#include "cpu.h" #include "cpu.h"
#include <86box/machine.h> #include <86box/machine.h>
int int
machine_at_6gxu_init(const machine_t *model) machine_at_6gxu_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/6gxu/6gxu.f1c", ret = bios_load_linear("roms/machines/6gxu/6gxu.f1c",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
machine_at_common_init_ex(model, 2); machine_at_common_init_ex(model, 2);
pci_init(PCI_CONFIG_TYPE_1); pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4); /* On-Board SCSI. Not emulated at the moment */ pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4); /* On-Board SCSI. Not emulated at the moment */
pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4); pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
device_add(&i440gx_device); device_add(&i440gx_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add(&keyboard_ps2_pci_device); device_add(&keyboard_ps2_pci_device);
device_add(&w83977ef_device); device_add(&w83977ef_device);
device_add(&sst_flash_39sf020_device); device_add(&sst_flash_39sf020_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 512); spd_register(SPD_TYPE_SDRAM, 0xF, 512);
device_add(&w83782d_device); /* fans: CPU, Power, System; temperatures: System, CPU, unused */ device_add(&w83782d_device); /* fans: CPU, Power, System; temperatures: System, CPU, unused */
hwm_values.temperatures[2] = 0; /* unused */ hwm_values.temperatures[2] = 0; /* unused */
hwm_values.voltages[1] = 1500; /* VGTL */ hwm_values.voltages[1] = 1500; /* VGTL */
return ret; return ret;
} }
int int
machine_at_s2dge_init(const machine_t *model) machine_at_s2dge_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/s2dge/2gu7301.rom", ret = bios_load_linear("roms/machines/s2dge/2gu7301.rom",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
machine_at_common_init_ex(model, 2); machine_at_common_init_ex(model, 2);
pci_init(PCI_CONFIG_TYPE_1); pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x0D, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0); pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0);
device_add(&i440gx_device); device_add(&i440gx_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add(&keyboard_ps2_ami_pci_device); device_add(&keyboard_ps2_ami_pci_device);
device_add(&w83977tf_device); device_add(&w83977tf_device);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 512); spd_register(SPD_TYPE_SDRAM, 0xF, 512);
device_add(&w83781d_device); /* fans: CPU1, CPU2, Thermal Control; temperatures: unused, CPU1, CPU2? */ device_add(&w83781d_device); /* fans: CPU1, CPU2, Thermal Control; temperatures: unused, CPU1, CPU2? */
hwm_values.fans[1] = 0; /* no CPU2 fan */ hwm_values.fans[1] = 0; /* no CPU2 fan */
hwm_values.temperatures[0] = 0; /* unused */ hwm_values.temperatures[0] = 0; /* unused */
hwm_values.temperatures[2] = 0; /* CPU2? */ hwm_values.temperatures[2] = 0; /* CPU2? */
return ret; return ret;
} }
int int
machine_at_fw6400gx_init(const machine_t *model) machine_at_fw6400gx_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/fw6400gx/FWGX1211.ROM", ret = bios_load_linear("roms/machines/fw6400gx/FWGX1211.ROM",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
machine_at_common_init_ex(model, 2); machine_at_common_init_ex(model, 2);
pci_init(PCI_CONFIG_TYPE_1); pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 4);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0A, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0C, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0E, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0E, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0); pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 0, 0);
device_add(&i440gx_device); device_add(&i440gx_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add(&keyboard_ps2_ami_pci_device); device_add(&keyboard_ps2_ami_pci_device);
device_add(&pc87309_15c_device); device_add(&pc87309_15c_device);
device_add(ics9xxx_get(ICS9250_08)); device_add(ics9xxx_get(ICS9250_08));
device_add(&sst_flash_29ee020_device); device_add(&sst_flash_29ee020_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 512); spd_register(SPD_TYPE_SDRAM, 0xF, 512);
device_add(&w83781d_device); /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */ device_add(&w83781d_device); /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */
hwm_values.temperatures[3] = 0; /* unused */ hwm_values.temperatures[3] = 0; /* unused */
hwm_values.voltages[1] = 1500; /* Vtt */ hwm_values.voltages[1] = 1500; /* Vtt */
return ret; return ret;
} }

124
src/qt/qt_settings_bus_tracking.hpp
View File

@@ -1,62 +1,62 @@
#ifndef QT_SETTINGS_BUS_TRACKING_HPP #ifndef QT_SETTINGS_BUS_TRACKING_HPP
#define QT_SETTINGS_BUS_TRACKING_HPP #define QT_SETTINGS_BUS_TRACKING_HPP
#include <QWidget> #include <QWidget>
#define TRACK_CLEAR 0 #define TRACK_CLEAR 0
#define TRACK_SET 1 #define TRACK_SET 1
#define DEV_HDD 0x01 #define DEV_HDD 0x01
#define DEV_CDROM 0x02 #define DEV_CDROM 0x02
#define DEV_ZIP 0x04 #define DEV_ZIP 0x04
#define DEV_MO 0x08 #define DEV_MO 0x08
#define BUS_MFM 0 #define BUS_MFM 0
#define BUS_ESDI 1 #define BUS_ESDI 1
#define BUS_XTA 2 #define BUS_XTA 2
#define BUS_IDE 3 #define BUS_IDE 3
#define BUS_SCSI 4 #define BUS_SCSI 4
#define CHANNEL_NONE 0xff #define CHANNEL_NONE 0xff
namespace Ui { namespace Ui {
class SettingsBusTracking; class SettingsBusTracking;
} }
class SettingsBusTracking { class SettingsBusTracking {
public: public:
explicit SettingsBusTracking(); explicit SettingsBusTracking();
~SettingsBusTracking() = default; ~SettingsBusTracking() = default;
/* These return 0xff is none is free. */ /* These return 0xff is none is free. */
uint8_t next_free_mfm_channel(); uint8_t next_free_mfm_channel();
uint8_t next_free_esdi_channel(); uint8_t next_free_esdi_channel();
uint8_t next_free_xta_channel(); uint8_t next_free_xta_channel();
uint8_t next_free_ide_channel(); uint8_t next_free_ide_channel();
uint8_t next_free_scsi_id(); uint8_t next_free_scsi_id();
int mfm_bus_full(); int mfm_bus_full();
int esdi_bus_full(); int esdi_bus_full();
int xta_bus_full(); int xta_bus_full();
int ide_bus_full(); int ide_bus_full();
int scsi_bus_full(); int scsi_bus_full();
/* Set: 0 = Clear the device from the tracking, 1 = Set the device on the tracking. /* Set: 0 = Clear the device from the tracking, 1 = Set the device on the tracking.
Device type: 1 = Hard Disk, 2 = CD-ROM, 4 = ZIP, 8 = Magneto-Optical. Device type: 1 = Hard Disk, 2 = CD-ROM, 4 = ZIP, 8 = Magneto-Optical.
Bus: 0 = MFM, 1 = ESDI, 2 = XTA, 3 = IDE, 4 = SCSI. */ Bus: 0 = MFM, 1 = ESDI, 2 = XTA, 3 = IDE, 4 = SCSI. */
void device_track(int set, uint8_t dev_type, int bus, int channel); void device_track(int set, uint8_t dev_type, int bus, int channel);
private: private:
/* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */ /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
uint64_t mfm_tracking { 0 }; uint64_t mfm_tracking { 0 };
/* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */ /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
uint64_t esdi_tracking { 0 }; uint64_t esdi_tracking { 0 };
/* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */ /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
uint64_t xta_tracking { 0 }; uint64_t xta_tracking { 0 };
/* 16 channels (prepatation for that weird IDE card), 2 devices per channel, 8 bits per device = 256 bits. */ /* 16 channels (prepatation for that weird IDE card), 2 devices per channel, 8 bits per device = 256 bits. */
uint64_t ide_tracking[4] { 0, 0, 0, 0 }; uint64_t ide_tracking[4] { 0, 0, 0, 0 };
/* 4 buses, 16 devices per bus, 8 bits per device (future-proofing) = 512 bits. */ /* 4 buses, 16 devices per bus, 8 bits per device (future-proofing) = 512 bits. */
uint64_t scsi_tracking[8] { 0, 0, 0, 0, 0, 0, 0, 0 }; uint64_t scsi_tracking[8] { 0, 0, 0, 0, 0, 0, 0, 0 };
}; };
#endif // QT_SETTINGS_BUS_TRACKING_HPP #endif // QT_SETTINGS_BUS_TRACKING_HPP

3
src/qt/qt_vulkanrenderer.cpp
View File

@@ -938,9 +938,6 @@ VulkanRenderer2::startNextFrame()
if (err != VK_SUCCESS) if (err != VK_SUCCESS)
qFatal("Failed to map memory: %d", err); qFatal("Failed to map memory: %d", err);
QMatrix4x4 m = m_proj; QMatrix4x4 m = m_proj;
#if 0
m.rotate(m_rotation, 0, 0, 1);
#endif
memcpy(p, m.constData(), 16 * sizeof(float)); memcpy(p, m.constData(), 16 * sizeof(float));
m_devFuncs->vkUnmapMemory(dev, m_bufMem); m_devFuncs->vkUnmapMemory(dev, m_bufMem);
p = nullptr; p = nullptr;

187
src/qt/qt_vulkanrenderer.hpp
View File

@@ -1,94 +1,93 @@
#pragma once #pragma once
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2022 Cacodemon345 ** Copyright (C) 2022 Cacodemon345
** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2017 The Qt Company Ltd.
** **
** "Redistribution and use in source and binary forms, with or without ** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are ** modification, are permitted provided that the following conditions are
** met: ** met:
** * Redistributions of source code must retain the above copyright ** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer. ** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright ** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in ** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the ** the documentation and/or other materials provided with the
** distribution. ** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its ** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived ** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission. ** from this software without specific prior written permission.
** **
** **
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** **
****************************************************************************/ ****************************************************************************/
#include <QVulkanWindow> #include <QVulkanWindow>
#include <QImage> #include <QImage>
#if QT_CONFIG(vulkan) #if QT_CONFIG(vulkan)
# include "qt_vulkanwindowrenderer.hpp" # include "qt_vulkanwindowrenderer.hpp"
class VulkanRenderer2 : public QVulkanWindowRenderer { class VulkanRenderer2 : public QVulkanWindowRenderer {
public: public:
void *mappedPtr = nullptr; void *mappedPtr = nullptr;
size_t imagePitch = 2048 * 4; size_t imagePitch = 2048 * 4;
VulkanRenderer2(QVulkanWindow *w); VulkanRenderer2(QVulkanWindow *w);
void initResources() override; void initResources() override;
void initSwapChainResources() override; void initSwapChainResources() override;
void releaseSwapChainResources() override; void releaseSwapChainResources() override;
void releaseResources() override; void releaseResources() override;
void startNextFrame() override; void startNextFrame() override;
private: private:
VkShaderModule createShader(const QString &name); VkShaderModule createShader(const QString &name);
bool createTexture(); bool createTexture();
bool createTextureImage(const QSize &size, VkImage *image, VkDeviceMemory *mem, bool createTextureImage(const QSize &size, VkImage *image, VkDeviceMemory *mem,
VkImageTiling tiling, VkImageUsageFlags usage, uint32_t memIndex); VkImageTiling tiling, VkImageUsageFlags usage, uint32_t memIndex);
bool writeLinearImage(const QImage &img, VkImage image, VkDeviceMemory memory); bool writeLinearImage(const QImage &img, VkImage image, VkDeviceMemory memory);
void ensureTexture(); void ensureTexture();
void updateSamplers(); void updateSamplers();
QVulkanWindow *m_window; QVulkanWindow *m_window;
QVulkanDeviceFunctions *m_devFuncs; QVulkanDeviceFunctions *m_devFuncs;
VkDeviceMemory m_bufMem = VK_NULL_HANDLE; VkDeviceMemory m_bufMem = VK_NULL_HANDLE;
VkBuffer m_buf = VK_NULL_HANDLE; VkBuffer m_buf = VK_NULL_HANDLE;
VkDescriptorBufferInfo m_uniformBufInfo[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT]; VkDescriptorBufferInfo m_uniformBufInfo[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT];
VkDescriptorPool m_descPool = VK_NULL_HANDLE; VkDescriptorPool m_descPool = VK_NULL_HANDLE;
VkDescriptorSetLayout m_descSetLayout = VK_NULL_HANDLE; VkDescriptorSetLayout m_descSetLayout = VK_NULL_HANDLE;
VkDescriptorSet m_descSet[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT]; VkDescriptorSet m_descSet[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT];
VkPipelineCache m_pipelineCache = VK_NULL_HANDLE; VkPipelineCache m_pipelineCache = VK_NULL_HANDLE;
VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE; VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE;
VkPipeline m_pipeline = VK_NULL_HANDLE; VkPipeline m_pipeline = VK_NULL_HANDLE;
VkSampler m_sampler = VK_NULL_HANDLE; VkSampler m_sampler = VK_NULL_HANDLE;
VkSampler m_linearSampler = VK_NULL_HANDLE; VkSampler m_linearSampler = VK_NULL_HANDLE;
VkImage m_texImage = VK_NULL_HANDLE; VkImage m_texImage = VK_NULL_HANDLE;
VkDeviceMemory m_texMem = VK_NULL_HANDLE; VkDeviceMemory m_texMem = VK_NULL_HANDLE;
bool m_texLayoutPending = false; bool m_texLayoutPending = false;
VkImageView m_texView = VK_NULL_HANDLE; VkImageView m_texView = VK_NULL_HANDLE;
VkImage m_texStaging = VK_NULL_HANDLE; VkImage m_texStaging = VK_NULL_HANDLE;
VkDeviceMemory m_texStagingMem = VK_NULL_HANDLE; VkDeviceMemory m_texStagingMem = VK_NULL_HANDLE;
bool m_texStagingPending = false; bool m_texStagingPending = false;
bool m_texStagingTransferLayout = false; bool m_texStagingTransferLayout = false;
QSize m_texSize; QSize m_texSize;
VkFormat m_texFormat; VkFormat m_texFormat;
QMatrix4x4 m_proj; QMatrix4x4 m_proj;
float m_rotation = 0.0f; };
}; #endif
#endif

6
src/qt/sdl_joystick.cpp
View File

@@ -41,15 +41,15 @@ joystick_init()
plat_joystick_state[c].nr_povs = SDL_JoystickNumHats(sdl_joy[c]); plat_joystick_state[c].nr_povs = SDL_JoystickNumHats(sdl_joy[c]);
for (d = 0; d < std::min(plat_joystick_state[c].nr_axes, 8); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_axes, 8); d++) {
sprintf(plat_joystick_state[c].axis[d].name, "Axis %i", d); snprintf(plat_joystick_state[c].axis[d].name, sizeof(plat_joystick_state[c].axis[d].name), "Axis %i", d);
plat_joystick_state[c].axis[d].id = d; plat_joystick_state[c].axis[d].id = d;
} }
for (d = 0; d < std::min(plat_joystick_state[c].nr_buttons, 8); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_buttons, 8); d++) {
sprintf(plat_joystick_state[c].button[d].name, "Button %i", d); snprintf(plat_joystick_state[c].button[d].name, sizeof(plat_joystick_state[c].button[d].name), "Button %i", d);
plat_joystick_state[c].button[d].id = d; plat_joystick_state[c].button[d].id = d;
} }
for (d = 0; d < std::min(plat_joystick_state[c].nr_povs, 4); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_povs, 4); d++) {
sprintf(plat_joystick_state[c].pov[d].name, "POV %i", d); snprintf(plat_joystick_state[c].pov[d].name, sizeof(plat_joystick_state[c].pov[d].name), "POV %i", d);
plat_joystick_state[c].pov[d].id = d; plat_joystick_state[c].pov[d].id = d;
} }
} }

2
src/sound/munt/MidiStreamParser.cpp
View File

@@ -191,7 +191,7 @@ Bit32u MidiStreamParserImpl::parseShortMessageDataBytes(const Bit8u stream[], Bi
} else if (dataByte < 0xF8) { } else if (dataByte < 0xF8) {
// Discard invalid bytes and start over // Discard invalid bytes and start over
char s[128]; char s[128];
sprintf(s, "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize); snprintf(s, sizeof(s), "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize);
midiReporter.printDebug(s); midiReporter.printDebug(s);
streamBufferSize = 0; // Clear streamBuffer streamBufferSize = 0; // Clear streamBuffer
return parsedLength; return parsedLength;

2
src/sound/munt/Part.cpp
View File

@@ -54,7 +54,7 @@ Part::Part(Synth *useSynth, unsigned int usePartNum) {
// Nasty hack for rhythm // Nasty hack for rhythm
timbreTemp = NULL; timbreTemp = NULL;
} else { } else {
sprintf(name, "Part %d", partNum + 1); snprintf(name, sizeof(name), "Part %d", partNum + 1);
timbreTemp = &synth->mt32ram.timbreTemp[partNum]; timbreTemp = &synth->mt32ram.timbreTemp[partNum];
} }
currentInstr[0] = 0; currentInstr[0] = 0;