From 42c4248a89509a83be0abdad2c32bc5106ef9504 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Fri, 23 Oct 2015 00:02:12 -0700
Subject: [PATCH] Persist GL information from context so we can write to crash
 log

---
 .../deadc0de/apple2ix/Apple2CrashHandler.java |  7 ++--
 .../deadc0de/apple2ix/Apple2Preferences.java  | 34 +++++++++++++++++++
 .../org/deadc0de/apple2ix/Apple2View.java     |  4 +++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
index 7aab9bc3..5a884f17 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2CrashHandler.java
@@ -15,7 +15,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.opengl.GLES20;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
@@ -203,9 +202,9 @@ public class Apple2CrashHandler {
                         allCrashData.append("SAMPLE RATE: ").append(sampleRate).append("\n");
                         allCrashData.append("MONO BUFSIZE: ").append(monoBufferSize).append("\n");
                         allCrashData.append("STEREO BUFSIZE: ").append(stereoBufferSize).append("\n");
-                        allCrashData.append("GPU VENDOR: ").append(GLES20.glGetString(GLES20.GL_VENDOR)).append("\n");
-                        allCrashData.append("GPU RENDERER: ").append(GLES20.glGetString(GLES20.GL_RENDERER)).append("\n");
-                        allCrashData.append("GPU VERSION: ").append(GLES20.glGetString(GLES20.GL_VERSION)).append("\n");
+                        allCrashData.append("GPU VENDOR: ").append(Apple2Preferences.GL_VENDOR.stringValue(activity)).append("\n");
+                        allCrashData.append("GPU RENDERER: ").append(Apple2Preferences.GL_RENDERER.stringValue(activity)).append("\n");
+                        allCrashData.append("GPU VERSION: ").append(Apple2Preferences.GL_VERSION.stringValue(activity)).append("\n");
 
                         File[] nativeCrashes = _nativeCrashFiles(activity);
                         if (nativeCrashes == null) {
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
index 2cdc41a1..66f9c1c5 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
@@ -595,8 +595,42 @@ public enum Apple2Preferences {
         public boolean booleanValue(Apple2Activity activity) {
             return activity.getPreferences(Context.MODE_PRIVATE).getBoolean(toString(), true);
         }
+    },
+    GL_VENDOR {
+        @Override
+        public void load(Apple2Activity activity) {
+            /* ... */
+        }
+
+        @Override
+        public String stringValue(Apple2Activity activity) {
+            return activity.getPreferences(Context.MODE_PRIVATE).getString(toString(), "");
+        }
+    },
+    GL_RENDERER {
+        @Override
+        public void load(Apple2Activity activity) {
+            /* ... */
+        }
+
+        @Override
+        public String stringValue(Apple2Activity activity) {
+            return activity.getPreferences(Context.MODE_PRIVATE).getString(toString(), "");
+        }
+    },
+    GL_VERSION {
+        @Override
+        public void load(Apple2Activity activity) {
+            /* ... */
+        }
+
+        @Override
+        public String stringValue(Apple2Activity activity) {
+            return activity.getPreferences(Context.MODE_PRIVATE).getString(toString(), "");
+        }
     };
 
+
     public enum HiresColor {
         BW,
         COLOR,
diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java
index a39a571b..087afc80 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java
@@ -16,6 +16,7 @@
 package org.deadc0de.apple2ix;
 
 import android.graphics.PixelFormat;
+import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
 
@@ -299,6 +300,9 @@ class Apple2View extends GLSurfaceView {
         }
 
         public void onSurfaceChanged(GL10 gl, int width, int height) {
+            Apple2Preferences.GL_VENDOR.saveString(mActivity, GLES20.glGetString(GLES20.GL_VENDOR));
+            Apple2Preferences.GL_RENDERER.saveString(mActivity, GLES20.glGetString(GLES20.GL_RENDERER));
+            Apple2Preferences.GL_VERSION.saveString(mActivity, GLES20.glGetString(GLES20.GL_VERSION));
             Apple2View.this.mActivity.graphicsInitialized(width, height);
         }