Merge branch 'shadps4-emu:main' into main

Author: ngoquang2708

src/sdl_window.cpp

@@ -304,6 +304,9 @@ void WindowSDL::onKeyPress(const SDL_Event* event) {
     if (axis != Input::Axis::AxisMax) {
         controller->Axis(0, axis, ax);
     }
+    if (SDL_GetCursor() != NULL) {
+        SDL_HideCursor();
+    }
 }
 
 void WindowSDL::onGamepadEvent(const SDL_Event* event) {
@@ -329,6 +332,9 @@ void WindowSDL::onGamepadEvent(const SDL_Event* event) {
         if (button != 0) {
             controller->CheckButton(0, button, event->type == SDL_EVENT_GAMEPAD_BUTTON_DOWN);
         }
+        if (SDL_GetCursor() != NULL) {
+            SDL_HideCursor();
+        }
         break;
     case SDL_EVENT_GAMEPAD_AXIS_MOTION:
         axis = event->gaxis.axis == SDL_GAMEPAD_AXIS_LEFTX           ? Input::Axis::LeftX

src/shader_recompiler/frontend/translate/translate.h

@@ -161,15 +161,19 @@ class Translator {
     // VOP1
     void V_MOV(const GcnInst& inst);
     void V_READFIRSTLANE_B32(const GcnInst& inst);
+    void V_CVT_I32_F64(const GcnInst& inst);
     void V_CVT_F64_I32(const GcnInst& inst);
     void V_CVT_F32_I32(const GcnInst& inst);
     void V_CVT_F32_U32(const GcnInst& inst);
     void V_CVT_U32_F32(const GcnInst& inst);
     void V_CVT_I32_F32(const GcnInst& inst);
     void V_CVT_F16_F32(const GcnInst& inst);
     void V_CVT_F32_F16(const GcnInst& inst);
+    void V_CVT_RPI_I32_F32(const GcnInst& inst);
     void V_CVT_FLR_I32_F32(const GcnInst& inst);
     void V_CVT_OFF_F32_I4(const GcnInst& inst);
+    void V_CVT_F32_F64(const GcnInst& inst);
+    void V_CVT_F64_F32(const GcnInst& inst);
     void V_CVT_F32_UBYTE(u32 index, const GcnInst& inst);
     void V_FRACT_F32(const GcnInst& inst);
     void V_TRUNC_F32(const GcnInst& inst);

src/shader_recompiler/frontend/translate/vector_alu.cpp

@@ -99,6 +99,8 @@ void Translator::EmitVectorAlu(const GcnInst& inst) {
         return V_MOV(inst);
     case Opcode::V_READFIRSTLANE_B32:
         return V_READFIRSTLANE_B32(inst);
+    case Opcode::V_CVT_I32_F64:
+        return V_CVT_I32_F64(inst);
     case Opcode::V_CVT_F64_I32:
         return V_CVT_F64_I32(inst);
     case Opcode::V_CVT_F32_I32:
@@ -115,6 +117,12 @@ void Translator::EmitVectorAlu(const GcnInst& inst) {
         return V_CVT_F32_F16(inst);
     case Opcode::V_CVT_FLR_I32_F32:
         return V_CVT_FLR_I32_F32(inst);
+    case Opcode::V_CVT_F32_F64:
+        return V_CVT_F32_F64(inst);
+    case Opcode::V_CVT_F64_F32:
+        return V_CVT_F64_F32(inst);
+    case Opcode::V_CVT_RPI_I32_F32:
+        return V_CVT_RPI_I32_F32(inst);
     case Opcode::V_CVT_OFF_F32_I4:
         return V_CVT_OFF_F32_I4(inst);
     case Opcode::V_CVT_F32_UBYTE0:
@@ -612,6 +620,11 @@ void Translator::V_MOV(const GcnInst& inst) {
     SetDst(inst.dst[0], GetSrc<IR::F32>(inst.src[0]));
 }
 
+void Translator::V_CVT_I32_F64(const GcnInst& inst) {
+    const IR::F64 src0{GetSrc64<IR::F64>(inst.src[0])};
+    SetDst(inst.dst[0], ir.ConvertFToS(32, src0));
+}
+
 void Translator::V_CVT_F64_I32(const GcnInst& inst) {
     const IR::U32 src0{GetSrc(inst.src[0])};
     SetDst64(inst.dst[0], ir.ConvertSToF(64, 32, src0));
@@ -649,6 +662,11 @@ void Translator::V_CVT_F32_F16(const GcnInst& inst) {
     SetDst(inst.dst[0], ir.FPConvert(32, ir.BitCast<IR::F16>(src0l)));
 }
 
+void Translator::V_CVT_RPI_I32_F32(const GcnInst& inst) {
+    const IR::F32 src0{GetSrc<IR::F32>(inst.src[0])};
+    SetDst(inst.dst[0], ir.ConvertFToI(32, true, ir.FPFloor(ir.FPAdd(src0, ir.Imm32(0.5f)))));
+}
+
 void Translator::V_CVT_FLR_I32_F32(const GcnInst& inst) {
     const IR::F32 src0{GetSrc<IR::F32>(inst.src[0])};
     SetDst(inst.dst[0], ir.ConvertFToI(32, true, ir.FPFloor(src0)));
@@ -663,6 +681,16 @@ void Translator::V_CVT_OFF_F32_I4(const GcnInst& inst) {
     SetDst(inst.dst[0], ir.Imm32(IntToFloat[src0.U32() & 0xF]));
 }
 
+void Translator::V_CVT_F32_F64(const GcnInst& inst) {
+    const IR::F64 src0{GetSrc64<IR::F64>(inst.src[0])};
+    SetDst(inst.dst[0], ir.FPConvert(32, src0));
+}
+
+void Translator::V_CVT_F64_F32(const GcnInst& inst) {
+    const IR::F32 src0{GetSrc<IR::F32>(inst.src[0])};
+    SetDst64(inst.dst[0], ir.FPConvert(64, src0));
+}
+
 void Translator::V_CVT_F32_UBYTE(u32 index, const GcnInst& inst) {
     const IR::U32 src0{GetSrc(inst.src[0])};
     const IR::U32 byte = ir.BitFieldExtract(src0, ir.Imm32(8 * index), ir.Imm32(8));

src/shader_recompiler/ir/ir_emitter.cpp

@@ -1402,6 +1402,15 @@ F16F32F64 IREmitter::FPConvert(size_t result_bitsize, const F16F32F64& value) {
         switch (value.Type()) {
         case Type::F16:
             return Inst<F32>(Opcode::ConvertF32F16, value);
+        case Type::F64:
+            return Inst<F32>(Opcode::ConvertF32F64, value);
+        default:
+            break;
+        }
+    case 64:
+        switch (value.Type()) {
+        case Type::F32:
+            return Inst<F64>(Opcode::ConvertF64F32, value);
         default:
             break;
         }