From fae3d1023872fda5b8a6f9ad4a49d59726ff8238 Mon Sep 17 00:00:00 2001 From: starfrost013 Date: Thu, 13 Mar 2025 13:38:09 +0000 Subject: [PATCH] Move class globals to pgraph. --- .../86box/nv/classes/vid_nv3_classes.h | 57 ++++++++++--------- src/include/86box/nv/render/vid_nv3_render.h | 2 +- src/include/86box/nv/vid_nv3.h | 26 ++++++++- .../nv3/classes/nv3_class_001_beta_factor.c | 3 - src/video/nv/nv3/classes/nv3_class_002_rop.c | 2 - .../nv/nv3/classes/nv3_class_003_chroma_key.c | 3 - .../nv/nv3/classes/nv3_class_004_plane_mask.c | 3 - .../nv3_class_005_clipping_rectangle.c | 3 - .../nv/nv3/classes/nv3_class_006_pattern.c | 3 - .../nv/nv3/classes/nv3_class_007_rectangle.c | 3 - .../nv/nv3/classes/nv3_class_008_point.c | 3 - src/video/nv/nv3/classes/nv3_class_009_line.c | 3 - src/video/nv/nv3/classes/nv3_class_00a_lin.c | 3 - .../nv/nv3/classes/nv3_class_00b_triangle.c | 3 - .../classes/nv3_class_00c_win95_gdi_text.c | 3 - src/video/nv/nv3/classes/nv3_class_00d_m2mf.c | 3 - .../nv3_class_00e_scaled_image_from_mem.c | 3 - src/video/nv/nv3/classes/nv3_class_010_blit.c | 3 - .../nv/nv3/classes/nv3_class_011_image.c | 3 - .../nv/nv3/classes/nv3_class_012_bitmap.c | 3 - .../classes/nv3_class_014_transfer2memory.c | 3 - .../nv3_class_015_stretched_image_from_cpu.c | 3 - .../nv3_class_017_d3d5_tri_zeta_buffer.c | 3 - .../classes/nv3_class_018_point_zeta_buffer.c | 1 - .../classes/nv3_class_01c_image_in_memory.c | 3 - .../nv/nv3/classes/nv3_class_shared_methods.c | 1 - 26 files changed, 55 insertions(+), 94 deletions(-) diff --git a/src/include/86box/nv/classes/vid_nv3_classes.h b/src/include/86box/nv/classes/vid_nv3_classes.h index c33927090..0e2a27b74 100644 --- a/src/include/86box/nv/classes/vid_nv3_classes.h +++ b/src/include/86box/nv/classes/vid_nv3_classes.h @@ -132,7 +132,9 @@ typedef struct nv3_color_16_a4r4g4b4_s uint8_t b : 4; } nv3_color_16_a4r4g4b4_t; -/* A1R5G5B5 format */ +/* A1R5G5B5 format + Can also be used for R5G5B5 +*/ typedef struct nv3_color_16_a1r5g5b5_s { uint8_t a : 1; @@ -233,6 +235,31 @@ typedef struct nv3_object_class_001 // Put the rest of it here } nv3_beta_factor_t; +/* Note: This is not used in the class, there are "special" rops that do certain things. So they need to be defined for code readability. It all gets optimised away +by the compiler anyway */ +typedef enum nv3_render_operation_type_e +{ + // Black + nv3_rop_blackness = 0x00, + // dst = !src + nv3_rop_dstinvert = 0x55, + // pattern invert + nv3_rop_patinvert = 0x5A, + // src ^ dst + nv3_rop_xor = 0x66, + // src & dst + nv3_rop_srcand = 0x88, + // dst = src (?) + nv3_rop_dstcopy = 0xAA, + // src = dst (?) + nv3_rop_srccopy = 0xCC, + // paint source + nv3_rop_srcpaint = 0xEE, + // pattern copy + nv3_rop_patcopy = 0xF0, + // White + nv3_rop_whiteness = 0xFF, +} nv3_render_operation_type; /* Object class 0x02 (real hardware) 0x14/0x43 (drivers) @@ -1152,30 +1179,4 @@ typedef struct nv3_grobj_s // PIO Subchannel info #define NV3_SUBCHANNEL_PIO_IS_PFIFO_FREE 0x0010 #define NV3_SUBCHANNEL_PIO_ALWAYS_ZERO_START 0x0012 -#define NV3_SUBCHANNEL_PIO_ALWAYS_ZERO_END 0x0017 - - - -// This area is used for holding universal representations of the U* registers... -extern struct nv3_object_class_001 nv3_beta_factor; -extern struct nv3_object_class_002 nv3_rop; -extern struct nv3_object_class_003 nv3_chroma_key; -extern struct nv3_object_class_004 nv3_plane_mask; -extern struct nv3_object_class_005 nv3_clipping_rectangle; -extern struct nv3_object_class_006 nv3_pattern; -extern struct nv3_object_class_007 nv3_rectangle; -extern struct nv3_object_class_008 nv3_point; -extern struct nv3_object_class_009 nv3_line; -extern struct nv3_object_class_00A nv3_lin; -extern struct nv3_object_class_00B nv3_triangle; -extern struct nv3_object_class_00C nv3_win95_gdi_text; -extern struct nv3_object_class_00D nv3_m2mf; -extern struct nv3_object_class_00E nv3_scaled_image_from_memory; -extern struct nv3_object_class_010 nv3_blit; -extern struct nv3_object_class_011 nv3_image; -extern struct nv3_object_class_012 nv3_bitmap; -extern struct nv3_object_class_014 nv3_transfer2memory; -extern struct nv3_object_class_015 nv3_stretched_image_from_cpu; -extern struct nv3_object_class_017 nv3_d3d5_tri; -extern struct nv3_object_class_018 nv3_point_zeta_buffer; -extern struct nv3_object_class_01C nv3_image_in_memory; \ No newline at end of file +#define NV3_SUBCHANNEL_PIO_ALWAYS_ZERO_END 0x0017 \ No newline at end of file diff --git a/src/include/86box/nv/render/vid_nv3_render.h b/src/include/86box/nv/render/vid_nv3_render.h index 98131680d..fd6ad8abf 100644 --- a/src/include/86box/nv/render/vid_nv3_render.h +++ b/src/include/86box/nv/render/vid_nv3_render.h @@ -15,5 +15,5 @@ * Copyright 2024-2025 Connor Hyde */ - #pragma once +#pragma once diff --git a/src/include/86box/nv/vid_nv3.h b/src/include/86box/nv/vid_nv3.h index 6a316e928..e2a74aba1 100644 --- a/src/include/86box/nv/vid_nv3.h +++ b/src/include/86box/nv/vid_nv3.h @@ -23,6 +23,7 @@ #pragma once #include <86box/nv/classes/vid_nv3_classes.h> +#include <86box/nv/render/vid_nv3_render.h> // The GPU base structure extern const device_config_t nv3_config[]; @@ -818,7 +819,6 @@ extern const device_config_t nv3_config[]; #define NV3_CRTC_REGISTER_RMA_MODE_MAX 0x0F - /* STRUCTURES FOR THE GPU START HERE OBJECT CLASS & RENDERING RELATED STUFF IS IN VID_NV3_CLASSES.H @@ -1130,6 +1130,30 @@ typedef struct nv3_pgraph_s uint32_t trapped_address; uint32_t trapped_data; uint32_t trapped_instance; + + /* This area is used for holding universal representations of the U* registers, which are actually mapped into MMIO */ + struct nv3_object_class_001 beta_factor; + struct nv3_object_class_002 rop; + struct nv3_object_class_003 chroma_key; + struct nv3_object_class_004 plane_mask; + struct nv3_object_class_005 clipping_rectangle; + struct nv3_object_class_006 pattern; + struct nv3_object_class_007 rectangle; + struct nv3_object_class_008 point; + struct nv3_object_class_009 line; + struct nv3_object_class_00A lin; + struct nv3_object_class_00B triangle; + struct nv3_object_class_00C win95_gdi_text; + struct nv3_object_class_00D m2mf; + struct nv3_object_class_00E scaled_image_from_memory; + struct nv3_object_class_010 blit; + struct nv3_object_class_011 image; + struct nv3_object_class_012 bitmap; + struct nv3_object_class_014 transfer2memory; + struct nv3_object_class_015 stretched_image_from_cpu; + struct nv3_object_class_017 d3d5_tri; + struct nv3_object_class_018 point_zeta_buffer; + struct nv3_object_class_01C image_in_memory; } nv3_pgraph_t; diff --git a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c index 2dc6a4022..b03a6cc21 100644 --- a/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c +++ b/src/video/nv/nv3/classes/nv3_class_001_beta_factor.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_001 beta_factor; void nv3_class_001_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_002_rop.c b/src/video/nv/nv3/classes/nv3_class_002_rop.c index f5a1c343e..f4102a605 100644 --- a/src/video/nv/nv3/classes/nv3_class_002_rop.c +++ b/src/video/nv/nv3/classes/nv3_class_002_rop.c @@ -27,9 +27,7 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> -struct nv3_object_class_002 nv3_rop; void nv3_class_002_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c index 8b99fa808..e86cea995 100644 --- a/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c +++ b/src/video/nv/nv3/classes/nv3_class_003_chroma_key.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_003 nv3_chroma_key; void nv3_class_003_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c index e32eb6333..f26dba5ef 100644 --- a/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c +++ b/src/video/nv/nv3/classes/nv3_class_004_plane_mask.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_004 nv3_plane_mask; void nv3_class_004_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c index b5d4a5b80..456bf6a20 100644 --- a/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c +++ b/src/video/nv/nv3/classes/nv3_class_005_clipping_rectangle.c @@ -26,9 +26,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_005 nv3_clipping_rectangle; void nv3_class_005_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_006_pattern.c b/src/video/nv/nv3/classes/nv3_class_006_pattern.c index 8442bde0d..2eb9755b6 100644 --- a/src/video/nv/nv3/classes/nv3_class_006_pattern.c +++ b/src/video/nv/nv3/classes/nv3_class_006_pattern.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_006 nv3_pattern; void nv3_class_006_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c index 9b0908b8d..cb4d34eaf 100644 --- a/src/video/nv/nv3/classes/nv3_class_007_rectangle.c +++ b/src/video/nv/nv3/classes/nv3_class_007_rectangle.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_007 nv3_rectangle; void nv3_class_007_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_008_point.c b/src/video/nv/nv3/classes/nv3_class_008_point.c index 4ecfa6d87..3e0bba3b1 100644 --- a/src/video/nv/nv3/classes/nv3_class_008_point.c +++ b/src/video/nv/nv3/classes/nv3_class_008_point.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_008 nv3_point; void nv3_class_008_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_009_line.c b/src/video/nv/nv3/classes/nv3_class_009_line.c index c8104cd9c..51a637cc4 100644 --- a/src/video/nv/nv3/classes/nv3_class_009_line.c +++ b/src/video/nv/nv3/classes/nv3_class_009_line.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_009 nv3_line; void nv3_class_009_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_00a_lin.c b/src/video/nv/nv3/classes/nv3_class_00a_lin.c index 8e83c2433..46d538095 100644 --- a/src/video/nv/nv3/classes/nv3_class_00a_lin.c +++ b/src/video/nv/nv3/classes/nv3_class_00a_lin.c @@ -28,9 +28,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_00A nv3_lin; void nv3_class_00a_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c index 766597af1..219e36b62 100644 --- a/src/video/nv/nv3/classes/nv3_class_00b_triangle.c +++ b/src/video/nv/nv3/classes/nv3_class_00b_triangle.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_00B nv3_triangle; void nv3_class_00b_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c index cceece8b7..17dcfd1a1 100644 --- a/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c +++ b/src/video/nv/nv3/classes/nv3_class_00c_win95_gdi_text.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_00C nv3_win95_gdi_text; void nv3_class_00c_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c index 6e2569cd9..a0b2773d4 100644 --- a/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c +++ b/src/video/nv/nv3/classes/nv3_class_00d_m2mf.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_00D nv3_m2mf; void nv3_class_00d_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c index e5cbb9634..d0e4970c2 100644 --- a/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c +++ b/src/video/nv/nv3/classes/nv3_class_00e_scaled_image_from_mem.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_00E nv3_scaled_image_from_mem; void nv3_class_00e_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_010_blit.c b/src/video/nv/nv3/classes/nv3_class_010_blit.c index 7c1e9626f..50149cd54 100644 --- a/src/video/nv/nv3/classes/nv3_class_010_blit.c +++ b/src/video/nv/nv3/classes/nv3_class_010_blit.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_010 nv3_blit; void nv3_class_010_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_011_image.c b/src/video/nv/nv3/classes/nv3_class_011_image.c index d7a2a7987..404ee3774 100644 --- a/src/video/nv/nv3/classes/nv3_class_011_image.c +++ b/src/video/nv/nv3/classes/nv3_class_011_image.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_011 nv3_image; void nv3_class_011_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c index 63a5f8e1d..8cba8c6c6 100644 --- a/src/video/nv/nv3/classes/nv3_class_012_bitmap.c +++ b/src/video/nv/nv3/classes/nv3_class_012_bitmap.c @@ -28,9 +28,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_012 nv3_bitmap; void nv3_class_012_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c index 197235c75..a1112b1c9 100644 --- a/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c +++ b/src/video/nv/nv3/classes/nv3_class_014_transfer2memory.c @@ -28,9 +28,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_014 nv3_transfer2memory; void nv3_class_014_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c index 1ab61faed..34997d724 100644 --- a/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c +++ b/src/video/nv/nv3/classes/nv3_class_015_stretched_image_from_cpu.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_015 nv3_stretched_image_from_cpu; void nv3_class_015_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c index 2bb2bfd77..2c4b88cfa 100644 --- a/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c +++ b/src/video/nv/nv3/classes/nv3_class_017_d3d5_tri_zeta_buffer.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_017 nv3_d3d5_tri; void nv3_class_017_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c index 68747c9ce..2ba880306 100644 --- a/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c +++ b/src/video/nv/nv3/classes/nv3_class_018_point_zeta_buffer.c @@ -27,7 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> struct nv3_object_class_018 nv3_d3d5_point_zeta_buffer; diff --git a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c index 0efb6c8ce..2f7440555 100644 --- a/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c +++ b/src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c @@ -27,9 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> - -struct nv3_object_class_01C nv3_image_in_memory; void nv3_class_01c_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) { diff --git a/src/video/nv/nv3/classes/nv3_class_shared_methods.c b/src/video/nv/nv3/classes/nv3_class_shared_methods.c index eb0469823..919fc5eb3 100644 --- a/src/video/nv/nv3/classes/nv3_class_shared_methods.c +++ b/src/video/nv/nv3/classes/nv3_class_shared_methods.c @@ -27,7 +27,6 @@ #include <86box/video.h> #include <86box/nv/vid_nv.h> #include <86box/nv/vid_nv3.h> -#include <86box/nv/classes/vid_nv3_classes.h> void nv3_generic_method(uint32_t name, uint32_t method_id, nv3_ramin_context_t context, nv3_grobj_t grobj) {