claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied the Voodoo commits from mainline PCem.

Browse Source
This commit is contained in:
OBattler
2017-08-12 02:02:49 +02:00
parent e7c9e28d1a
commit 9a86aa0a4b
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/VIDEO/vid_voodoo.c
View File

@@ -6116,7 +6116,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p)
default:
if (voodoo->fbiInit7 & FBIINIT7_CMDFIFO_ENABLE)
{
fatal("Unknown register write in CMDFIFO mode %08x %08x\n", addr, val);
pclog("Unknown register write in CMDFIFO mode %08x %08x\n", addr, val);
}
else
{

24
src/VIDEO/vid_voodoo_codegen_x86-64.h
View File

@@ -800,10 +800,10 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(0x47);
addbyte(0xc3);
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos] = (block_pos - depth_jump_pos) - 1;
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos2] = (block_pos - depth_jump_pos2) - 1;
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos] = (block_pos - depth_jump_pos) - 1;
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos2] = (block_pos - depth_jump_pos2) - 1;
if ((params->fogMode & (FOG_ENABLE|FOG_CONSTANT|FOG_Z|FOG_ALPHA)) == FOG_ENABLE)
{
@@ -1047,8 +1047,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
addbyte(0x66); /*MOVD XMM0, EAX*/
addbyte(0x0f);
@@ -1201,8 +1201,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
break;
case TCA_MSELECT_LOD_FRAC:
@@ -1371,8 +1371,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[0]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
addbyte(0x66); /*MOVD XMM4, EAX*/
addbyte(0x0f);
@@ -1569,8 +1569,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EBX, EDX*/
addbyte(0xd3);
addbyte(0x0f); /*CMOVA EBX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EBX, EDX*/
addbyte(0x4d);
addbyte(0xda);
break;
case TCA_MSELECT_LOD_FRAC:

28
src/VIDEO/vid_voodoo_codegen_x86.h
View File

@@ -759,14 +759,10 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(0x47);
addbyte(0xc3);
if (depth_jump_pos)
{
*(uint8_t *)&code_block[depth_jump_pos] = (block_pos - depth_jump_pos) - 1;
}
if (depth_jump_pos2)
{
*(uint8_t *)&code_block[depth_jump_pos2] = (block_pos - depth_jump_pos2) - 1;
}
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos] = (block_pos - depth_jump_pos) - 1;
if (depth_jump_pos)
*(uint8_t *)&code_block[depth_jump_pos2] = (block_pos - depth_jump_pos2) - 1;
if ((params->fogMode & (FOG_ENABLE|FOG_CONSTANT|FOG_Z|FOG_ALPHA)) == FOG_ENABLE)
{
@@ -1034,8 +1030,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
addbyte(0x66); /*MOVD XMM0, EAX*/
addbyte(0x0f);
@@ -1186,8 +1182,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
break;
case TCA_MSELECT_LOD_FRAC:
@@ -1356,8 +1352,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[0]);
addbyte(0x39); /*CMP EAX, EDX*/
addbyte(0xd0);
addbyte(0x0f); /*CMOVA EAX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EAX, EDX*/
addbyte(0x4d);
addbyte(0xc2);
addbyte(0x66); /*MOVD XMM4, EAX*/
addbyte(0x0f);
@@ -1552,8 +1548,8 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
addbyte(params->detail_scale[1]);
addbyte(0x39); /*CMP EBX, EDX*/
addbyte(0xd3);
addbyte(0x0f); /*CMOVA EBX, EDX*/
addbyte(0x47);
addbyte(0x0f); /*CMOVNL EBX, EDX*/
addbyte(0x4d);
addbyte(0xda);
break;
case TCA_MSELECT_LOD_FRAC: