merging

app/src/main/cpp/gfx/drivers/gl2.c

@@ -2632,6 +2632,26 @@ static bool gl2_frame(void *data, const void *frame,
    if (!gl)
       return false;
 
+   /* Have to reset rendering state which libretro core
+    * could easily have overridden. */
+   if (gl->flags & GL2_FLAG_HW_RENDER_FBO_INIT)
+   {
+      gl2_update_input_size(gl, frame_width, frame_height, pitch, false);
+      if (!(gl->flags & GL2_FLAG_FBO_INITED))
+      {
+         gl2_renderchain_bind_backbuffer();
+         gl2_set_viewport(gl, width, height, false, true);
+      }
+
+      gl2_renderchain_restore_default_state(gl);
+
+      glDisable(GL_STENCIL_TEST);
+      glDisable(GL_BLEND);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+      glBlendEquation(GL_FUNC_ADD);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+   }
+
      glClear(GL_COLOR_BUFFER_BIT);
      gl2_render_background(gl);
 
@@ -2653,6 +2673,7 @@ static bool gl2_frame(void *data, const void *frame,
    /* Render to texture in first pass. */
    if (gl->flags & GL2_FLAG_FBO_INITED)
    {
+      RARCH_LOG("gl->flags & GL2_FLAG_FBO_INITED");
       gl2_renderchain_recompute_pass_sizes(
             gl, chain,
             frame_width, frame_height,
@@ -2748,26 +2769,6 @@ static bool gl2_frame(void *data, const void *frame,
          glGenerateMipmap(GL_TEXTURE_2D);
    }
 
-   /* Have to reset rendering state which libretro core
-    * could easily have overridden. */
-   if (gl->flags & GL2_FLAG_HW_RENDER_FBO_INIT)
-   {
-      gl2_update_input_size(gl, frame_width, frame_height, pitch, false);
-      if (!(gl->flags & GL2_FLAG_FBO_INITED))
-      {
-         gl2_renderchain_bind_backbuffer();
-         gl2_set_viewport(gl, width, height, false, true);
-      }
-
-      gl2_renderchain_restore_default_state(gl);
-
-      glDisable(GL_STENCIL_TEST);
-      glDisable(GL_BLEND);
-      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-      glBlendEquation(GL_FUNC_ADD);
-      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-   }
-
    gl->tex_info.tex           = gl->texture[gl->tex_index];
    gl->tex_info.input_size[0] = frame_width;
    gl->tex_info.input_size[1] = frame_height;

app/src/main/java/com/xugame/gameconsole/TextCopyFileActivity.java

@@ -35,7 +35,7 @@ import java.io.InputStream;
 
 public class TextCopyFileActivity extends Activity {
     private static final String TAG = "TextCopyFileActivityTAG";
-    private Button btn1, btn2, btn3,btn4;
+    private Button btn1, btn2, btn3, btn4;
     private Context mContext;
 
     @Override
@@ -140,10 +140,11 @@ public class TextCopyFileActivity extends Activity {
         btn4.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startGame(Environment.getExternalStorageDirectory().getAbsolutePath() + "/arcade/rom/shenghuaweiji.bin",
-                        mContext.getFilesDir().getParent() + "/cores/mednafen_psx_libretro_android.so",
-                        EmulatorType.PS1);
 
+
+                startGame(Environment.getExternalStorageDirectory().getAbsolutePath() + "/arcade/rom/PPSSPP/三国无双/三国无双.iso",
+                        mContext.getFilesDir().getParent() + "/cores/ppsspp_libretro_android.so",
+                        EmulatorType.PSP);
             }
         });
     }
@@ -171,6 +172,8 @@ public class TextCopyFileActivity extends Activity {
                     break;
                 case PS1:
                     coreName="mednafen_psx_libretro_android.so";
+                case PSP:
+                    coreName = "ppsspp_libretro_android.so";
                     break;
             }
             if (!TextUtils.isEmpty(coreName))

app/src/main/java/com/xugame/gameconsole/emulator/EmulatorType.java

@@ -6,5 +6,6 @@ public enum EmulatorType {
     CPS1,
     CPS2,
     CPS3,
-    PS1
+    PS1,
+    PSP,
 }

app/src/main/res/layout/textcopp_layout.xml

@@ -24,11 +24,14 @@
         android:layout_below="@+id/btn1"
         android:layout_marginTop="54dp"
         android:text="Super Mario"></Button>
+
     <Button
         android:id="@+id/btn4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/btn1"
         android:layout_marginTop="54dp"
-        android:text="龙珠"></Button>
-</LinearLayout>
+        android:text="三国无双"></Button>
+</LinearLayout>
+
+