mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 10:28:19 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #11 from PCBox/master

Browse Source 
Fully fix NetBSD builds
This commit is contained in:
starfrost
2025-04-24 14:28:53 +01:00
committed by GitHub
parent a6882d7eb9 a4af738ede
commit bd1829f02e
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/nv/nv3/classes/nv3_class_006_pattern.c
View File

@@ -60,13 +60,17 @@ void nv3_class_006_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
case NV3_PATTERN_UNUSED_DRIVER_BUG:
break;
case NV3_PATTERN_COLOR0:
{
nv3_color_expanded_t expanded_colour0 = nv3_render_expand_color(param, grobj);
nv3_render_set_pattern_color(expanded_colour0, false);
break;
}
case NV3_PATTERN_COLOR1:
{
nv3_color_expanded_t expanded_colour1 = nv3_render_expand_color(param, grobj);
nv3_render_set_pattern_color(expanded_colour1, true);
break;
}
case NV3_PATTERN_BITMAP_HIGH:
nv3->pgraph.pattern_bitmap = 0; //reset
nv3->pgraph.pattern_bitmap |= ((uint64_t)param << 32);

2
src/video/nv/nv3/classes/nv3_class_01c_image_in_memory.c
View File

@@ -38,6 +38,7 @@ void nv3_class_01c_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
{
/* Color format of the image */
case NV3_IMAGE_IN_MEMORY_COLOR_FORMAT:
{
// convert to how the bpixel registers represent surface
uint32_t real_format = 1;
@@ -65,6 +66,7 @@ void nv3_class_01c_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
nv_log("Method Execution: Image in Memory BUF%d COLOR_FORMAT=0x%04x\n", src_buffer_id, param);
break;
}
/* DOn't log invalid */
case NV3_IMAGE_IN_MEMORY_IN_MEMORY_DMA_CTX_TYPE:
nv3_pgraph_interrupt_invalid(NV3_PGRAPH_INTR_1_SOFTWARE_METHOD_PENDING);

4
src/video/nv/nv3/render/nv3_render_core.c
View File

@@ -443,6 +443,7 @@ void nv3_render_write_pixel(nv3_coord_16_t position, uint32_t color, nv3_grobj_t
break;
case 15:
case 16:
{
uint16_t* vram_16 = (uint16_t*)(nv3->nvbase.svga.vram);
pixel_addr_vram >>= 1;
@@ -471,7 +472,9 @@ void nv3_render_write_pixel(nv3_coord_16_t position, uint32_t color, nv3_grobj_t
nv3->nvbase.svga.changedvram[pixel_addr_vram >> 11] = changeframecount;
break;
}
case 32:
{
uint32_t* vram_32 = (uint32_t*)(nv3->nvbase.svga.vram);
pixel_addr_vram >>= 2;
@@ -482,6 +485,7 @@ void nv3_render_write_pixel(nv3_coord_16_t position, uint32_t color, nv3_grobj_t
nv3->nvbase.svga.changedvram[pixel_addr_vram >> 10] = changeframecount;
break;
}
}
/* Go write the pixel */