fx

weihuoya · Feb 21, 2022 · 2d4b932 · 2d4b932
1 parent 032d212
commit 2d4b932
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/src/android/app/src/main/java/org/citra/emu/overlay/InputOverlay.java b/src/android/app/src/main/java/org/citra/emu/overlay/InputOverlay.java
@@ -235,7 +235,6 @@ public boolean onTouchEvent(MotionEvent event) {
                 if (input.getPointerId() == pointerId) {
                     input.onPointerUp(pointerId, pointerX, pointerY);
                     isProcessed = true;
-                    break;
                 }
             }
             break;
@@ -326,14 +325,17 @@ private void saveControlPosition(int buttonId, Rect bounds) {
     }
 
     public void refreshControls() {
-        // Remove all the overlay buttons
+        int previousSize = mInputObjects.size();
         mIsLandscape =
             getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+        // Remove all the overlay buttons
         mInputObjects.clear();
         mOverlayPointer = new InputOverlayPointer();
 
         if (sHideInputOverlay) {
-            invalidate();
+            if (previousSize > 0) {
+                invalidate();
+            }
             return;
         }
 

diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
@@ -141,7 +141,7 @@
 
     <string name="emulation_screen_rotation">Rotar pantalla</string>
     <string name="menu_emulation_camera">Resetear Cámara</string>
-    <string name="emulation_edit_layout">Editar posición de controles</string>
+    <string name="emulation_edit_layout">Editar posición de controles/Controles de alternar</string>
     <string name="emulation_screen_layout">Posición de pantalla personalizada</string>
     <string name="emulation_stop_running">Salir</string>
     <string name="emulation_done">Hecho</string>

diff --git a/src/android/app/src/main/res/values-zh/strings.xml b/src/android/app/src/main/res/values-zh/strings.xml
@@ -141,7 +141,7 @@
 
     <string name="emulation_screen_rotation">屏幕旋转</string>
     <string name="menu_emulation_camera">重置摄像头</string>
-    <string name="emulation_edit_layout">编辑按键</string>
+    <string name="emulation_edit_layout">编辑按键/显示隐藏</string>
     <string name="emulation_screen_layout">自定义布局</string>
     <string name="emulation_stop_running">退出游戏</string>
     <string name="emulation_done">确定</string>

diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
@@ -141,7 +141,7 @@
 
     <string name="emulation_screen_rotation">Screen Rotation</string>
     <string name="menu_emulation_camera">Reset Camera</string>
-    <string name="emulation_edit_layout">Edit Buttons</string>
+    <string name="emulation_edit_layout">Edit Buttons/Toggle Controls</string>
     <string name="emulation_screen_layout">Custom Layout</string>
     <string name="emulation_stop_running">Exit Game</string>
     <string name="emulation_done">Done</string>

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
@@ -103,7 +103,7 @@ void KernelSystem::Run(ARM_Interface* cpu) {
     // If we don't have a currently active thread then don't execute instructions,
     // instead advance to the next event and try to yield to the next thread
     if (thread_managers[new_cpu_id]->GetCurrentThread() == nullptr) {
-        LOG_TRACE(Core_ARM11, "Core {} idling", current_cpu_id);
+        LOG_TRACE(Core_ARM11, "Core {} idling", new_cpu_id);
         current_cpu->GetTimer().Idle();
         thread_managers[new_cpu_id]->PrepareReschedule();
     } else {

diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -1466,7 +1466,6 @@ bool RasterizerOpenGL::AccelerateDisplay(const GPU::Regs::FramebufferConfig& con
     if (framebuffer_addr == 0) {
         return false;
     }
-    MICROPROFILE_SCOPE(OpenGL_CacheManagement);
 
     SurfaceParams src_params;
     src_params.addr = framebuffer_addr;
@@ -1570,7 +1569,7 @@ void RasterizerOpenGL::SamplerInfo::SyncWithConfig(const TextureConfig& config)
     if (lod_bias != config.lod.bias) {
         lod_bias = config.lod.bias;
         if (GLES) {
-            LOG_DEBUG(Render_OpenGL, "sync sampler lod bias: {}", lod_bias);
+            LOG_TRACE(Render_OpenGL, "sync sampler lod bias: {}", lod_bias);
         } else {
             glSamplerParameterf(s, GL_TEXTURE_LOD_BIAS, lod_bias / 256.0f);
         }

diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -478,7 +478,7 @@ void RendererOpenGL::RenderToMailbox(const Layout::FramebufferLayout& layout) {
 /// run in present thread
 bool RendererOpenGL::TryPresent() {
     if (mailbox->IsPresentEmpty()) {
-        LOG_DEBUG(Render_OpenGL, "mailbox no frame to present");
+        LOG_TRACE(Render_OpenGL, "mailbox no frame to present");
         return false;
     }