xemu-project/nv2a_vsh_cpu
1
0
Fork 0
mirror of https://github.com/xemu-project/nv2a_vsh_cpu.git synced 2024-11-23 09:49:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes mismerge that caused incorrect handling of ilu inputs (float[] instead of the old Register struct)

Browse Source
This commit is contained in:
Erik Abair 2022-06-24 23:03:05 -07:00
parent ead0af5dee
commit f60fadfa4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nv2a_vsh_emulator.c
View File

@ -146,7 +146,7 @@ static inline void apply(Nv2aVshExecutionState *state,
const Nv2aVshStep *step) { const Nv2aVshStep *step) {
float mac_inputs[3 * 4]; float mac_inputs[3 * 4];
float ilu_input[4]; float ilu_input[4];
prepare_inputs(mac_inputs, &ilu_input, state, step); prepare_inputs(mac_inputs, ilu_input, state, step);
if (step->mac.opcode) { if (step->mac.opcode) {
apply_operation(state, &step->mac, mac_inputs); apply_operation(state, &step->mac, mac_inputs);
@ -161,7 +161,7 @@ static inline void apply_track_context_writes(Nv2aVshExecutionState *state,
bool *context_dirty) { bool *context_dirty) {
float mac_inputs[3 * 4]; float mac_inputs[3 * 4];
float ilu_input[4]; float ilu_input[4];
prepare_inputs(mac_inputs, &ilu_input, state, step); prepare_inputs(mac_inputs, ilu_input, state, step);
if (step->mac.opcode) { if (step->mac.opcode) {
apply_operation(state, &step->mac, mac_inputs); apply_operation(state, &step->mac, mac_inputs);
@ -172,7 +172,7 @@ static inline void apply_track_context_writes(Nv2aVshExecutionState *state,
} }
} }
if (step->ilu.opcode) { if (step->ilu.opcode) {
apply_operation(state, &step->ilu, &ilu_input); apply_operation(state, &step->ilu, ilu_input);
if (step->ilu.outputs[0].type == NV2ART_CONTEXT) { if (step->ilu.outputs[0].type == NV2ART_CONTEXT) {
context_dirty[step->ilu.outputs[0].index] = true; context_dirty[step->ilu.outputs[0].index] = true;
} else if (step->ilu.outputs[1].type == NV2ART_CONTEXT) { } else if (step->ilu.outputs[1].type == NV2ART_CONTEXT) {