[Android] Disable the workaround for Qualcomm devices with driver >= 53 for the rotated framebuffer since it is fixed now.

This commit is contained in:
Ryan Houdek 2013-11-15 16:56:21 -06:00
parent b9d7bb9012
commit 0720026dab
2 changed files with 6 additions and 4 deletions

View File

@ -68,12 +68,14 @@ public final class EmulationActivity extends Activity
// Due to a bug in Adreno, it renders the screen rotated 90 degrees when using OpenGL // Due to a bug in Adreno, it renders the screen rotated 90 degrees when using OpenGL
// Flip the width and height when on Adreno to work around this. // Flip the width and height when on Adreno to work around this.
// This bug is fixed in Qualcomm driver v53
// Mali isn't affected by this bug. // Mali isn't affected by this bug.
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if (prefs.getString("gpuPref", "Software Rendering").equals("OGL") if (prefs.getString("gpuPref", "Software Rendering").equals("OGL")
&& VideoSettingsFragment.SupportsGLES3() && VideoSettingsFragment.SupportsGLES3()
&& VideoSettingsFragment.m_GLVendor != null && VideoSettingsFragment.m_GLVendor != null
&& VideoSettingsFragment.m_GLVendor.equals("Qualcomm")) && VideoSettingsFragment.m_GLVendor.equals("Qualcomm")
&& VideoSettingsFragment.m_QualcommVersion < 53.0f)
NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth); NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth);
else else
NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight); NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight);

View File

@ -28,6 +28,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
public static String m_GLVendor; public static String m_GLVendor;
public static String m_GLRenderer; public static String m_GLRenderer;
public static String m_GLExtensions; public static String m_GLExtensions;
public static float m_QualcommVersion;
private Activity m_activity; private Activity m_activity;
/** /**
@ -165,7 +166,6 @@ public final class VideoSettingsFragment extends PreferenceFragment
{ {
int mVStart = m_GLVersion.indexOf("V@") + 2; int mVStart = m_GLVersion.indexOf("V@") + 2;
int mVEnd = 0; int mVEnd = 0;
float mVersion;
for (int a = mVStart; a < m_GLVersion.length(); ++a) for (int a = mVStart; a < m_GLVersion.length(); ++a)
{ {
@ -176,9 +176,9 @@ public final class VideoSettingsFragment extends PreferenceFragment
} }
} }
mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd)); m_QualcommVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
if (mVersion >= 14.0f) if (m_QualcommVersion >= 14.0f)
mSupportsGLES3 = true; mSupportsGLES3 = true;
} }
} }