ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slightly rename HLE_API_METHOD into NV097_HLE_API

This commit is contained in:
PatrickvL 2023-11-05 15:04:47 +01:00
parent 3dc9036d39
commit b9afc1bf51
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/D3D8/Direct3D9/HleInNv2a.h
View File

@ -194,9 +194,11 @@ typedef enum _X_D3DAPI_ENUM {
} X_D3DAPI_ENUM;
// virtual NV2A register for HLE API handler
#define HLE_API_METHOD 0x00000080 // See COMMAND_WORD_MASK_METHOD
# define NV097_HLE_API 0x00000080 /* Snugged this method in the middle between
# define NV097_SET_OBJECT 0x00000000 the first method, and the next known one :
# define NV097_NO_OPERATION 0x00000100 Aternatively, move to the end, after NV097_DEBUG_INIT */
#define HLE_PUSH_ENCODE(dword_count) PUSH_ENCODE(PUSH_INSTR_IMM_NOINC, dword_count, PUSH_SUBCH_0, HLE_API_METHOD, PUSH_TYPE_METHOD)
#define HLE_PUSH_ENCODE(dword_count) PUSH_ENCODE(PUSH_INSTR_IMM_NOINC, dword_count, PUSH_SUBCH_0, NV097_HLE_API, PUSH_TYPE_METHOD)
static inline DWORD FtoDW(FLOAT f) { return *((DWORD*)&f); }
static inline FLOAT DWtoF(DWORD f) { return *((FLOAT*)&f); }
@ -334,7 +336,7 @@ D3DDevice_SetIndices_4
/*
notes for my trials and errors.
jackchen notes for my trials and errors.
Original idea was to use a virtual pushbuffer method to represent each patched HLE api and push the virtual pushbuffer method to pushbuffer then let pgraph method handler handle the patched HLE api later.
this should solve the sync issue between pushbuffer and HLE api.

8
src/devices/video/EmuNV2A_PGRAPH.cpp
View File

@ -1535,8 +1535,8 @@ void HLE_API_handle_method
uint32_t* argv
)
{
X_D3DAPI_ENUM hleAPI;
hleAPI = (X_D3DAPI_ENUM)argv[0];
X_D3DAPI_ENUM hleAPI = (X_D3DAPI_ENUM)argv[0];
switch (hleAPI)
{
//case X_CDevice_SetStateUP: break;
@ -2145,7 +2145,7 @@ int pgraph_handle_method(
switch (method) { // TODO : Replace 'special cases' with check on (arg0 >> 29 == COMMAND_INSTRUCTION_NON_INCREASING_METHODS)
//list all special cases here.
//case NV097_SET_OBJECT:
case HLE_API_METHOD: [[fallthrough]];
case NV097_HLE_API: [[fallthrough]];
case NV097_NO_OPERATION: //this is used as short jump or interrupt, padding in front of fixups in order to make sure fixup will be applied before the instruction enter cache.
//case NV097_SET_BEGIN_END://now we use pg->primitive_mode for PrititiveType state //enclave subset of drawing instructions. need special handling.
// NV097_ARRAY_ELEMENT32 is PUSH_INSTR_IMM_INC, test case: Otogi. it's logical since NV097_ARRAY_ELEMENT32 is used to transfer the last odd index, if there were one.
@ -2178,7 +2178,7 @@ int pgraph_handle_method(
switch (method) {
case NV097_SET_OBJECT://done
break;
case HLE_API_METHOD:
case NV097_HLE_API:
HLE_API_handle_method(argv);
break;
case NV097_NO_OPERATION://done