mirror of
https://github.com/2009scape/2009Scape-mobile.git
synced 2025-12-18 04:20:11 -07:00
Minecraft now recognize correctly OpenGL version
This commit is contained in:
parent
22415b9925
commit
19e4088cc8
4 changed files with 11 additions and 10 deletions
Binary file not shown.
BIN
app/libs/boardwalk_lwjgl_origok.jar
Normal file
BIN
app/libs/boardwalk_lwjgl_origok.jar
Normal file
Binary file not shown.
|
|
@ -818,10 +818,6 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
||||||
|
|
||||||
// Change info for useful dump
|
// Change info for useful dump
|
||||||
System.setProperty("java.vm.info", Build.MANUFACTURER + " " + Build.MODEL + ", Android " + Build.VERSION.RELEASE);
|
System.setProperty("java.vm.info", Build.MANUFACTURER + " " + Build.MODEL + ", Android " + Build.VERSION.RELEASE);
|
||||||
|
|
||||||
GLContext.getCapabilities();
|
|
||||||
|
|
||||||
ContextCapabilities cc = new ContextCapabilities();
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Tools.showError(MainActivity.this, e, true);
|
Tools.showError(MainActivity.this, e, true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -225,9 +225,14 @@ public final class GLContext {
|
||||||
static int getSupportedExtensions(final Set<String> supported_extensions) {
|
static int getSupportedExtensions(final Set<String> supported_extensions) {
|
||||||
// Detect OpenGL version first
|
// Detect OpenGL version first
|
||||||
|
|
||||||
final String version = "1.3";/*glGetString(GL_VERSION);*/
|
/* final */ String version = glGetString(GL_VERSION);
|
||||||
if ( version == null )
|
|
||||||
throw new IllegalStateException("glGetString(GL_VERSION) returned null - possibly caused by missing current context.");
|
if (version == null) {
|
||||||
|
// throw new IllegalStateException("glGetString(GL_VERSION) returned null - possibly caused by missing current context.");
|
||||||
|
|
||||||
|
System.err.println("Unable to get real OpenGL version, inserting OpenGL 2.0.");
|
||||||
|
version = "2.0";
|
||||||
|
}
|
||||||
|
|
||||||
final StringTokenizer version_tokenizer = new StringTokenizer(version, ". ");
|
final StringTokenizer version_tokenizer = new StringTokenizer(version, ". ");
|
||||||
final String major_string = version_tokenizer.nextToken();
|
final String major_string = version_tokenizer.nextToken();
|
||||||
|
|
@ -270,7 +275,7 @@ public final class GLContext {
|
||||||
supported_extensions.add(tokenizer.nextToken());
|
supported_extensions.add(tokenizer.nextToken());
|
||||||
} else {
|
} else {
|
||||||
// Use forward compatible indexed EXTENSIONS
|
// Use forward compatible indexed EXTENSIONS
|
||||||
final int extensionCount = glGetInteger(GL_NUM_EXTENSIONS);
|
final int extensionCount = GL11.glGetInteger(GL_NUM_EXTENSIONS);
|
||||||
|
|
||||||
for ( int i = 0; i < extensionCount; i++ )
|
for ( int i = 0; i < extensionCount; i++ )
|
||||||
supported_extensions.add(glGetStringi(GL_EXTENSIONS, i));
|
supported_extensions.add(glGetStringi(GL_EXTENSIONS, i));
|
||||||
|
|
@ -280,7 +285,7 @@ public final class GLContext {
|
||||||
Util.checkGLError(); // Make sure we have no errors up to this point
|
Util.checkGLError(); // Make sure we have no errors up to this point
|
||||||
|
|
||||||
try {
|
try {
|
||||||
profileMask = glGetInteger(GL_CONTEXT_PROFILE_MASK);
|
profileMask = GL11.glGetInteger(GL_CONTEXT_PROFILE_MASK);
|
||||||
// Retrieving GL_CONTEXT_PROFILE_MASK may generate an INVALID_OPERATION error on certain implementations, ignore.
|
// Retrieving GL_CONTEXT_PROFILE_MASK may generate an INVALID_OPERATION error on certain implementations, ignore.
|
||||||
// Happens on pre10.1 ATI drivers, when ContextAttribs.withProfileCompatibility is not used
|
// Happens on pre10.1 ATI drivers, when ContextAttribs.withProfileCompatibility is not used
|
||||||
Util.checkGLError();
|
Util.checkGLError();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue