From 230b90954d43e8e72273f7f4e8fa8b39c594d6c5 Mon Sep 17 00:00:00 2001 From: starfrost013 Date: Mon, 26 May 2025 01:41:10 +0100 Subject: [PATCH] don't force 1-byte packing of vid_nv3_classes --- src/include/86box/nv/classes/vid_nv3_classes.h | 2 -- src/include/86box/nv/vid_nv.h | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/include/86box/nv/classes/vid_nv3_classes.h b/src/include/86box/nv/classes/vid_nv3_classes.h index d5dc3ed43..5c2cc5b8e 100644 --- a/src/include/86box/nv/classes/vid_nv3_classes.h +++ b/src/include/86box/nv/classes/vid_nv3_classes.h @@ -36,7 +36,6 @@ // or everything FUCKS UP // // DO NOT REMOVE! DO NOT REMOVE! DO NOT REMOVE! -#pragma pack(push, 1) // CLass names for debugging extern const char* nv3_class_names[]; @@ -1192,7 +1191,6 @@ typedef struct nv3_grobj_s uint32_t grobj_3; } nv3_grobj_t; // TODO: PATCHCORDS!!!! TO LINK ALL OF THIS TOGETHER!!! -#pragma pack(pop) // return packing to whatever it was before this disaster // PIO Subchannel info #define NV3_SUBCHANNEL_PIO_IS_PFIFO_FREE 0x0010 diff --git a/src/include/86box/nv/vid_nv.h b/src/include/86box/nv/vid_nv.h index ef5e80d71..84ccf5a15 100644 --- a/src/include/86box/nv/vid_nv.h +++ b/src/include/86box/nv/vid_nv.h @@ -6,7 +6,10 @@ * * This file is part of the 86Box distribution. * - * Shared implementation file for all NVIDIA GPUs (hopefully to be) emulated by 86box. + * The real Nvidia driver. + * Implements components shared by all variants of the Nvidia GPUs (hopefully to be) supported by 86Box. + * + * This driver draws on collaborative work by many people over many years. * * Credit to: * @@ -18,6 +21,7 @@ * - xemu developers https://github.com/xemu-project/xemu * - RivaTV developers https://rivatv.sourceforge.net (esp. https://rivatv.sourceforge.net/stuff/riva128.txt) * - Nvidia for leaking their driver symbols numerous times ;^) https://nvidia.com + * - Vort (Bochs GeForce fork) https://github.com/Vort/Bochs/tree/geforce * - People who prevented me from giving up (various) * * Authors: Connor Hyde / starfrost