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

Don't flip x/y coordinates and w/h of rectangles.

Browse Source
This commit is contained in:
starfrost013
2025-03-22 03:05:09 +00:00
parent b170c51307
commit fea06b6d9a
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/nv/vid_nv3.h
View File

@@ -1442,6 +1442,7 @@ extern nv3_t* nv3;
void* nv3_init(const device_t *info);
void nv3_close(void* priv);
void nv3_speed_changed(void *priv);
void nv3_recalc_timings(svga_t* svga);
void nv3_force_redraw(void* priv);
// Memory Mapping

10
src/video/nv/nv3/classes/nv3_class_007_rectangle.c
View File

@@ -44,8 +44,9 @@ void nv3_class_007_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
// If the size is submitted, render it.
if (method_id & 0x04)
{
nv3->pgraph.rectangle.size[index].w = (param >> 16) & 0xFFFF;
nv3->pgraph.rectangle.size[index].h = param & 0xFFFF;
nv3->pgraph.rectangle.size[index].w = param & 0xFFFF;
nv3->pgraph.rectangle.size[index].h = (param >> 16) & 0xFFFF;
nv_log("Rect%d Size=%d,%d\n", index, nv3->pgraph.rectangle.size[index].w, nv3->pgraph.rectangle.size[index].h);
@@ -53,8 +54,9 @@ void nv3_class_007_method(uint32_t param, uint32_t method_id, nv3_ramin_context_
}
else // position
{
nv3->pgraph.rectangle.position[index].x = (param >> 16) & 0xFFFF;
nv3->pgraph.rectangle.position[index].y = param & 0xFFFF;
nv3->pgraph.rectangle.position[index].x = param & 0xFFFF;
nv3->pgraph.rectangle.position[index].y = (param >> 16) & 0xFFFF;
nv_log("Rect%d Position=%d,%d\n", index, nv3->pgraph.rectangle.position[index].x, nv3->pgraph.rectangle.position[index].y);
}

8
src/video/nv/nv3/nv3_core.c
View File

@@ -488,22 +488,24 @@ void nv3_recalc_timings(svga_t* svga)
// i don't we should force the top 2 bits to 1...
// required for VESA resolutions, force parameters higher
if (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 1 << (NV3_CRTC_REGISTER_FORMAT_VDT10)) svga->vtotal += 0x400;
if (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 1 << (NV3_CRTC_REGISTER_FORMAT_VDE10)) svga->dispend += 0x400;
if (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 1 << (NV3_CRTC_REGISTER_FORMAT_VRS10)) svga->vblankstart += 0x400;
if (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 1 << (NV3_CRTC_REGISTER_FORMAT_VBS10)) svga->vsyncstart += 0x400;
if (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 1 << (NV3_CRTC_REGISTER_FORMAT_HBE6)) svga->hdisp += 0x400;
if (svga->crtc[NV3_CRTC_REGISTER_HEB] & 0x01)
svga->hdisp += 0x100; // large screen bit
// Set the pixel mode
switch (svga->crtc[NV3_CRTC_REGISTER_PIXELMODE] & 0x03)
{
///0x0 is VGA textmode
case NV3_CRTC_REGISTER_PIXELMODE_8BPP:
svga->bpp = 8;
svga->lowres = 0;
svga->map8 = svga->pallook;
svga->render = svga_render_8bpp_highres;
break;
case NV3_CRTC_REGISTER_PIXELMODE_16BPP:
@@ -703,14 +705,14 @@ void nv3_svga_out(uint16_t addr, uint8_t val, void* priv)
Additionally only do it if the value actually changed*/
if (old_value != val)
{
// Thx to Fuel who basically wrote all the SVGA compatibility code already (although I fixed some issues), because VGA is boring
// Thx to Fuel who basically wrote most of the SVGA compatibility code already (although I fixed some issues), because VGA is boring
// and in the words of an ex-Rendition/3dfx/NVIDIA engineer, "VGA was basically an undocumented bundle of steaming you-know-what.
// And it was essential that any cores the PC 3D startups acquired had to work with all the undocumented modes and timing tweaks (mode X, etc.)"
if (nv3->nvbase.svga.crtcreg < 0xE
&& nv3->nvbase.svga.crtcreg > 0x10)
{
nv3->nvbase.svga.fullchange = changeframecount;
svga_recalctimings(&nv3->nvbase.svga);
nv3_recalc_timings(&nv3->nvbase.svga);
}
}

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

@@ -172,7 +172,7 @@ void nv3_render_pixel(nv3_position_16_t position, uint32_t color, nv3_grobj_t gr
TODO: MOVE TO BPIXEL DEPTH or GROBJ0 to determine this, once we figure out how to get the bpixel depth.
*/
uint32_t src = 0, dst = 0;
switch (framebuffer_bpp)

1
src/video/nv/nv3/subsystems/nv3_pramdac.c
View File

@@ -384,5 +384,4 @@ void nv3_pramdac_write(uint32_t address, uint32_t value)
{
nv_log(": Unknown register write (address=0x%08x)\n", address);
}
}