Update #50 - Bug fixes and shader improvements

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/OpenGLObjects.java

@@ -51,13 +51,13 @@ class OpenGLObjects {
 
 	}
 
-	static class BufferArrayGL implements IBufferArrayGL {
+	static class VertexArrayGL implements IVertexArrayGL {
 
 		private static int hashGen = 0;
 		final WebGLVertexArray ptr;
 		final int hash;
 
-		BufferArrayGL(WebGLVertexArray ptr) {
+		VertexArrayGL(WebGLVertexArray ptr) {
 			this.ptr = ptr;
 			this.hash = ++hashGen;
 		}

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformOpenGL.java

@@ -130,7 +130,7 @@ public class PlatformOpenGL {
 	@JSBody(params = { "arr", "idx", "num" }, script = "arr[idx] = num;")
 	private static native void setArrayInt(JSArray<JSNumber> arr, int idx, int num);
 
-	public static final void _wglDrawBuffers(int buffer) {
+	public static void _wglDrawBuffers(int buffer) {
 		if(glesVers == 200) {
 			if(buffer != 0x8CE0) { // GL_COLOR_ATTACHMENT0
 				throw new UnsupportedOperationException();
@@ -142,7 +142,7 @@ public class PlatformOpenGL {
 		}
 	}
 
-	public static final void _wglDrawBuffers(int[] buffers) {
+	public static void _wglDrawBuffers(int[] buffers) {
 		if(glesVers == 200) {
 			if(buffers.length != 1 || buffers[0] != 0x8CE0) { // GL_COLOR_ATTACHMENT0
 				throw new UnsupportedOperationException();
@@ -163,19 +163,19 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glReadBuffer")
 	public static native void _wglReadBuffer(int glEnum);
 
-	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer buffer) {
+	public static void _wglReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer buffer) {
 		_wglReadPixelsN(x, y, width, height, format, type, WASMGCBufferAllocator.getUnsignedByteBufferView(buffer));
 	}
 
-	public static final void _wglReadPixels_u16(int x, int y, int width, int height, int format, int type, ByteBuffer buffer) {
+	public static void _wglReadPixels_u16(int x, int y, int width, int height, int format, int type, ByteBuffer buffer) {
 		_wglReadPixelsN(x, y, width, height, format, type, WASMGCBufferAllocator.getUnsignedShortBufferView(buffer));
 	}
 
-	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer buffer) {
+	public static void _wglReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer buffer) {
 		_wglReadPixelsN(x, y, width, height, format, type, WASMGCBufferAllocator.getIntBufferView(buffer));
 	}
 
-	public static final void _wglReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer buffer) {
+	public static void _wglReadPixels(int x, int y, int width, int height, int format, int type, FloatBuffer buffer) {
 		_wglReadPixelsN(x, y, width, height, format, type, WASMGCBufferAllocator.getFloatBufferView(buffer));
 	}
 
@@ -188,119 +188,119 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glLineWidth")
 	public static native void _wglLineWidth(float width);
 
-	public static final IBufferGL _wglGenBuffers() {
+	public static IBufferGL _wglGenBuffers() {
 		return new OpenGLObjects.BufferGL(_wglGenBuffersN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glGenBuffers")
 	static native WebGLBuffer _wglGenBuffersN();
 
-	public static final ITextureGL _wglGenTextures() {
+	public static ITextureGL _wglGenTextures() {
 		return new OpenGLObjects.TextureGL(_wglGenTexturesN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glGenTextures")
 	static native WebGLTexture _wglGenTexturesN();
 
-	public static final IBufferArrayGL _wglGenVertexArrays() {
-		return new OpenGLObjects.BufferArrayGL(_wglGenVertexArraysN());
+	public static IVertexArrayGL _wglGenVertexArrays() {
+		return new OpenGLObjects.VertexArrayGL(_wglGenVertexArraysN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glGenVertexArrays")
 	public static native WebGLVertexArray _wglGenVertexArraysN();
 
-	public static final IProgramGL _wglCreateProgram() {
+	public static IProgramGL _wglCreateProgram() {
 		return new OpenGLObjects.ProgramGL(_wglCreateProgramN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glCreateProgram")
 	static native WebGLProgram _wglCreateProgramN();
 
-	public static final IShaderGL _wglCreateShader(int type) {
+	public static IShaderGL _wglCreateShader(int type) {
 		return new OpenGLObjects.ShaderGL(_wglCreateShaderN(type));
 	}
 
 	@Import(module = "platformOpenGL", name = "glCreateShader")
 	static native WebGLShader _wglCreateShaderN(int type);
 
-	public static final IFramebufferGL _wglCreateFramebuffer() {
+	public static IFramebufferGL _wglCreateFramebuffer() {
 		return new OpenGLObjects.FramebufferGL(_wglCreateFramebufferN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glCreateFramebuffer")
 	static native WebGLFramebuffer _wglCreateFramebufferN();
 
-	public static final IRenderbufferGL _wglCreateRenderbuffer() {
+	public static IRenderbufferGL _wglCreateRenderbuffer() {
 		return new OpenGLObjects.RenderbufferGL(_wglCreateRenderbufferN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glCreateRenderbuffer")
 	static native WebGLRenderbuffer _wglCreateRenderbufferN();
 
-	public static final IQueryGL _wglGenQueries() {
+	public static IQueryGL _wglGenQueries() {
 		return new OpenGLObjects.QueryGL(_wglGenQueriesN());
 	}
 
 	@Import(module = "platformOpenGL", name = "glGenQueries")
 	static native WebGLQuery _wglGenQueriesN();
 
-	public static final void _wglDeleteBuffers(IBufferGL objId) {
+	public static void _wglDeleteBuffers(IBufferGL objId) {
 		_wglDeleteBuffersN(((OpenGLObjects.BufferGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteBuffers")
 	static native void _wglDeleteBuffersN(WebGLBuffer objId);
 
-	public static final void _wglDeleteTextures(ITextureGL objId) {
+	public static void _wglDeleteTextures(ITextureGL objId) {
 		_wglDeleteTexturesN(((OpenGLObjects.TextureGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteTextures")
 	static native void _wglDeleteTexturesN(WebGLTexture objId);
 
-	public static final void _wglDeleteVertexArrays(IBufferArrayGL objId) {
-		_wglDeleteVertexArraysN(((OpenGLObjects.BufferArrayGL)objId).ptr);
+	public static void _wglDeleteVertexArrays(IVertexArrayGL objId) {
+		_wglDeleteVertexArraysN(((OpenGLObjects.VertexArrayGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteVertexArrays")
 	static native void _wglDeleteVertexArraysN(WebGLVertexArray objId);
 
-	public static final void _wglDeleteProgram(IProgramGL objId) {
+	public static void _wglDeleteProgram(IProgramGL objId) {
 		_wglDeleteProgramN(((OpenGLObjects.ProgramGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteProgram")
 	static native void _wglDeleteProgramN(WebGLProgram objId);
 
-	public static final void _wglDeleteShader(IShaderGL objId) {
+	public static void _wglDeleteShader(IShaderGL objId) {
 		_wglDeleteShaderN(((OpenGLObjects.ShaderGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteShader")
 	static native void _wglDeleteShaderN(WebGLShader objId);
 
-	public static final void _wglDeleteFramebuffer(IFramebufferGL objId) {
+	public static void _wglDeleteFramebuffer(IFramebufferGL objId) {
 		_wglDeleteFramebufferN(((OpenGLObjects.FramebufferGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteFramebuffer")
 	static native void _wglDeleteFramebufferN(WebGLFramebuffer objId);
 
-	public static final void _wglDeleteRenderbuffer(IRenderbufferGL objId) {
+	public static void _wglDeleteRenderbuffer(IRenderbufferGL objId) {
 		_wglDeleteRenderbufferN(((OpenGLObjects.RenderbufferGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteRenderbuffer")
 	static native void _wglDeleteRenderbufferN(WebGLRenderbuffer objId);
 
-	public static final void _wglDeleteQueries(IQueryGL objId) {
+	public static void _wglDeleteQueries(IQueryGL objId) {
 		_wglDeleteQueriesN(((OpenGLObjects.QueryGL)objId).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDeleteQueries")
 	static native void _wglDeleteQueriesN(WebGLQuery objId);
 
-	public static final void _wglBindBuffer(int target, IBufferGL bufObj) {
+	public static void _wglBindBuffer(int target, IBufferGL bufObj) {
 		_wglBindBufferN(target, bufObj != null ? ((OpenGLObjects.BufferGL)bufObj).ptr : null);
 	}
 
@@ -310,38 +310,38 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glBufferData")
 	public static native void _wglBufferData(int target, int size, int usage);
 
-	public static final void _wglBufferData(int target, ByteBuffer buffer, int usage) {
+	public static void _wglBufferData(int target, ByteBuffer buffer, int usage) {
 		_wglBufferDataN(target, WASMGCBufferAllocator.getUnsignedByteBufferView(buffer), usage);
 	}
 
-	public static final void _wglBufferData(int target, IntBuffer buffer, int usage) {
+	public static void _wglBufferData(int target, IntBuffer buffer, int usage) {
 		_wglBufferDataN(target, WASMGCBufferAllocator.getIntBufferView(buffer), usage);
 	}
 
-	public static final void _wglBufferData(int target, FloatBuffer buffer, int usage) {
+	public static void _wglBufferData(int target, FloatBuffer buffer, int usage) {
 		_wglBufferDataN(target, WASMGCBufferAllocator.getFloatBufferView(buffer), usage);
 	}
 
 	@Import(module = "platformOpenGL", name = "glBufferData")
 	static native void _wglBufferDataN(int target, ArrayBufferView typedArray, int usage);
 
-	public static final void _wglBufferSubData(int target, int dstOffset, ByteBuffer buffer) {
+	public static void _wglBufferSubData(int target, int dstOffset, ByteBuffer buffer) {
 		_wglBufferSubDataN(target, dstOffset, WASMGCBufferAllocator.getUnsignedByteBufferView(buffer));
 	}
 
-	public static final void _wglBufferSubData(int target, int dstOffset, IntBuffer buffer) {
+	public static void _wglBufferSubData(int target, int dstOffset, IntBuffer buffer) {
 		_wglBufferSubDataN(target, dstOffset, WASMGCBufferAllocator.getIntBufferView(buffer));
 	}
 
-	public static final void _wglBufferSubData(int target, int dstOffset, FloatBuffer buffer) {
+	public static void _wglBufferSubData(int target, int dstOffset, FloatBuffer buffer) {
 		_wglBufferSubDataN(target, dstOffset, WASMGCBufferAllocator.getFloatBufferView(buffer));
 	}
 
 	@Import(module = "platformOpenGL", name = "glBufferSubData")
 	static native void _wglBufferSubDataN(int target, int dstOffset, ArrayBufferView typedArray);
 
-	public static final void _wglBindVertexArray(IBufferArrayGL objId) {
-		_wglBindVertexArrayN(objId != null ? ((OpenGLObjects.BufferArrayGL)objId).ptr : null);
+	public static void _wglBindVertexArray(IVertexArrayGL objId) {
+		_wglBindVertexArrayN(objId != null ? ((OpenGLObjects.VertexArrayGL)objId).ptr : null);
 	}
 
 	@Import(module = "platformOpenGL", name = "glBindVertexArray")
@@ -363,7 +363,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glActiveTexture")
 	public static native void _wglActiveTexture(int texture);
 
-	public static final void _wglBindTexture(int target, ITextureGL objId) {
+	public static void _wglBindTexture(int target, ITextureGL objId) {
 		_wglBindTextureN(target, objId != null ? ((OpenGLObjects.TextureGL)objId).ptr : null);
 	}
 
@@ -376,7 +376,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glTexParameteri")
 	public static native void _wglTexParameteri(int target, int param, int value);
 
-	public static final void _wglTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
+	public static void _wglTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
 			int border, int format, int type, ByteBuffer data) {
 		_wglTexImage3DN(target, level, internalFormat, width, height, depth, border, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedByteBufferView(data) : null);
@@ -386,31 +386,31 @@ public class PlatformOpenGL {
 	static native void _wglTexImage3DN(int target, int level, int internalFormat, int width, int height, int depth,
 			int border, int format, int type, ArrayBufferView typedArray);
 
-	public static final void _wglTexImage2D(int target, int level, int internalFormat, int width, int height, int border,
+	public static void _wglTexImage2D(int target, int level, int internalFormat, int width, int height, int border,
 			int format, int type, ByteBuffer data) {
 		_wglTexImage2DN(target, level, internalFormat, width, height, border, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedByteBufferView(data) : null);
 	}
 
-	public static final void _wglTexImage2Du16(int target, int level, int internalFormat, int width, int height, int border,
+	public static void _wglTexImage2Du16(int target, int level, int internalFormat, int width, int height, int border,
 			int format, int type, ByteBuffer data) {
 		_wglTexImage2DN(target, level, internalFormat, width, height, border, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedShortBufferView(data) : null);
 	}
 
-	public static final void _wglTexImage2Df32(int target, int level, int internalFormat, int width, int height, int border,
+	public static void _wglTexImage2Df32(int target, int level, int internalFormat, int width, int height, int border,
 			int format, int type, ByteBuffer data) {
 		_wglTexImage2DN(target, level, internalFormat, width, height, border, format, type,
 				data != null ? WASMGCBufferAllocator.getFloatBufferView(data) : null);
 	}
 
-	public static final void _wglTexImage2D(int target, int level, int internalFormat, int width,
+	public static void _wglTexImage2D(int target, int level, int internalFormat, int width,
 			int height, int border, int format, int type, IntBuffer data) {
 		_wglTexImage2DN(target, level, internalFormat, width, height, border, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedByteBufferView(data) : null);
 	}
 
-	public static final void _wglTexImage2Df32(int target, int level, int internalFormat, int width,
+	public static void _wglTexImage2Df32(int target, int level, int internalFormat, int width,
 			int height, int border, int format, int type, FloatBuffer data) {
 		_wglTexImage2DN(target, level, internalFormat, width, height, border, format, type,
 				data != null ? WASMGCBufferAllocator.getFloatBufferView(data) : null);
@@ -420,25 +420,25 @@ public class PlatformOpenGL {
 	static native void _wglTexImage2DN(int target, int level, int internalFormat, int width, int height, int border,
 			int format, int type, ArrayBufferView typedArray);
 
-	public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset,
+	public static void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset,
 			int width, int height, int format, int type, ByteBuffer data) {
 		_wglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedByteBufferView(data) : null);
 	}
 
-	public static final void _wglTexSubImage2Du16(int target, int level, int xoffset, int yoffset,
+	public static void _wglTexSubImage2Du16(int target, int level, int xoffset, int yoffset,
 			int width, int height, int format, int type, ByteBuffer data) {
 		_wglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedShortBufferView(data) : null);
 	}
 
-	public static final void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset,
+	public static void _wglTexSubImage2D(int target, int level, int xoffset, int yoffset,
 			int width, int height, int format, int type, IntBuffer data) {
 		_wglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
 				data != null ? WASMGCBufferAllocator.getUnsignedByteBufferView(data) : null);
 	}
 
-	public static final void _wglTexSubImage2Df32(int target, int level, int xoffset, int yoffset,
+	public static void _wglTexSubImage2Df32(int target, int level, int xoffset, int yoffset,
 			int width, int height, int format, int type, FloatBuffer data) {
 		_wglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
 				data != null ? WASMGCBufferAllocator.getFloatBufferView(data) : null);
@@ -461,70 +461,70 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glGenerateMipmap")
 	public static native void _wglGenerateMipmap(int target);
 
-	public static final void _wglShaderSource(IShaderGL shader, String str) {
+	public static void _wglShaderSource(IShaderGL shader, String str) {
 		_wglShaderSourceN(((OpenGLObjects.ShaderGL)shader).ptr, BetterJSStringConverter.stringToJS(str));
 	}
 
 	@Import(module = "platformOpenGL", name = "glShaderSource")
 	static native void _wglShaderSourceN(WebGLShader shader, JSString str);
 
-	public static final void _wglCompileShader(IShaderGL shader) {
+	public static void _wglCompileShader(IShaderGL shader) {
 		_wglCompileShaderN(((OpenGLObjects.ShaderGL)shader).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glCompileShader")
 	static native void _wglCompileShaderN(WebGLShader shader);
 
-	public static final int _wglGetShaderi(IShaderGL shader, int param) {
+	public static int _wglGetShaderi(IShaderGL shader, int param) {
 		return _wglGetShaderiN(((OpenGLObjects.ShaderGL)shader).ptr, param);
 	}
 
 	@Import(module = "platformOpenGL", name = "glGetShaderi")
 	static native int _wglGetShaderiN(WebGLShader shader, int param);
 
-	public static final String _wglGetShaderInfoLog(IShaderGL shader) {
+	public static String _wglGetShaderInfoLog(IShaderGL shader) {
 		return BetterJSStringConverter.stringFromJS(_wglGetShaderInfoLogN(((OpenGLObjects.ShaderGL)shader).ptr));
 	}
 
 	@Import(module = "platformOpenGL", name = "glGetShaderInfoLog")
 	static native JSString _wglGetShaderInfoLogN(WebGLShader shader);
 
-	public static final void _wglUseProgram(IProgramGL prog) {
+	public static void _wglUseProgram(IProgramGL prog) {
 		_wglUseProgramN(prog != null ? ((OpenGLObjects.ProgramGL)prog).ptr : null);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUseProgram")
 	static native void _wglUseProgramN(WebGLProgram prog);
 
-	public static final void _wglAttachShader(IProgramGL prog, IShaderGL shader) {
+	public static void _wglAttachShader(IProgramGL prog, IShaderGL shader) {
 		_wglAttachShaderN(((OpenGLObjects.ProgramGL)prog).ptr, ((OpenGLObjects.ShaderGL)shader).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glAttachShader")
 	static native void _wglAttachShaderN(WebGLProgram prog, WebGLShader shader);
 
-	public static final void _wglDetachShader(IProgramGL prog, IShaderGL shader) {
+	public static void _wglDetachShader(IProgramGL prog, IShaderGL shader) {
 		_wglDetachShaderN(((OpenGLObjects.ProgramGL)prog).ptr, ((OpenGLObjects.ShaderGL)shader).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glDetachShader")
 	public static native void _wglDetachShaderN(WebGLProgram prog, WebGLShader shader);
 
-	public static final void _wglLinkProgram(IProgramGL prog) {
+	public static void _wglLinkProgram(IProgramGL prog) {
 		_wglLinkProgramN(((OpenGLObjects.ProgramGL)prog).ptr);
 	}
 
 	@Import(module = "platformOpenGL", name = "glLinkProgram")
 	static native void _wglLinkProgramN(WebGLProgram prog);
 
-	public static final int _wglGetProgrami(IProgramGL prog, int param) {
+	public static int _wglGetProgrami(IProgramGL prog, int param) {
 		return _wglGetProgramiN(((OpenGLObjects.ProgramGL)prog).ptr, param);
 	}
 
 	@Import(module = "platformOpenGL", name = "glGetProgrami")
 	static native int _wglGetProgramiN(WebGLProgram prog, int param);
 
-	public static final String _wglGetProgramInfoLog(IProgramGL prog) {
+	public static String _wglGetProgramInfoLog(IProgramGL prog) {
 		return BetterJSStringConverter.stringFromJS(_wglGetProgramInfoLogN(((OpenGLObjects.ProgramGL)prog).ptr));
 	}
 
@@ -543,21 +543,21 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glDrawElementsInstanced")
 	public static native void _wglDrawElementsInstanced(int mode, int count, int type, int offset, int instanced);
 
-	public static final void _wglBindAttribLocation(IProgramGL prog, int index, String str) {
+	public static void _wglBindAttribLocation(IProgramGL prog, int index, String str) {
 		_wglBindAttribLocationN(((OpenGLObjects.ProgramGL)prog).ptr, index, BetterJSStringConverter.stringToJS(str));
 	}
 
 	@Import(module = "platformOpenGL", name = "glBindAttribLocation")
 	static native void _wglBindAttribLocationN(WebGLProgram prog, int index, JSString str);
 
-	public static final int _wglGetAttribLocation(IProgramGL prog, String str) {
+	public static int _wglGetAttribLocation(IProgramGL prog, String str) {
 		return _wglGetAttribLocationN(((OpenGLObjects.ProgramGL)prog).ptr, BetterJSStringConverter.stringToJS(str));
 	}
 
 	@Import(module = "platformOpenGL", name = "glGetAttribLocation")
 	static native int _wglGetAttribLocationN(WebGLProgram prog, JSString str);
 
-	public static final IUniformGL _wglGetUniformLocation(IProgramGL prog, String str) {
+	public static IUniformGL _wglGetUniformLocation(IProgramGL prog, String str) {
 		WebGLUniformLocation ret = _wglGetUniformLocationN(((OpenGLObjects.ProgramGL)prog).ptr, BetterJSStringConverter.stringToJS(str));
 		return ret != null ? new OpenGLObjects.UniformGL(ret) : null;
 	}
@@ -565,84 +565,84 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glGetUniformLocation")
 	static native WebGLUniformLocation _wglGetUniformLocationN(WebGLProgram prog, JSString str);
 
-	public static final int _wglGetUniformBlockIndex(IProgramGL prog, String str) {
+	public static int _wglGetUniformBlockIndex(IProgramGL prog, String str) {
 		return _wglGetUniformBlockIndexN(((OpenGLObjects.ProgramGL)prog).ptr, BetterJSStringConverter.stringToJS(str));
 	}
 
 	@Import(module = "platformOpenGL", name = "glGetUniformBlockIndex")
 	static native int _wglGetUniformBlockIndexN(WebGLProgram prog, JSString str);
 
-	public static final void _wglBindBufferRange(int target, int index, IBufferGL bufferId, int offset, int size) {
+	public static void _wglBindBufferRange(int target, int index, IBufferGL bufferId, int offset, int size) {
 		_wglBindBufferRangeN(target, index, ((OpenGLObjects.BufferGL)bufferId).ptr, offset, size);
 	}
 
 	@Import(module = "platformOpenGL", name = "glBindBufferRange")
 	static native void _wglBindBufferRangeN(int target, int index, WebGLBuffer bufferId, int offset, int size);
 
-	public static final void _wglUniformBlockBinding(IProgramGL prog, int blockIndex, int bufferIndex) {
+	public static void _wglUniformBlockBinding(IProgramGL prog, int blockIndex, int bufferIndex) {
 		_wglUniformBlockBindingN(((OpenGLObjects.ProgramGL)prog).ptr, blockIndex, bufferIndex);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniformBlockBinding")
 	static native void _wglUniformBlockBindingN(WebGLProgram prog, int blockIndex, int bufferIndex);
 
-	public static final void _wglUniform1f(IUniformGL uniformIndex, float x) {
+	public static void _wglUniform1f(IUniformGL uniformIndex, float x) {
 		if(uniformIndex != null) _wglUniform1fN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform1f")
 	public static native void _wglUniform1fN(WebGLUniformLocation uniformIndex, float x);
 
-	public static final void _wglUniform2f(IUniformGL uniformIndex, float x, float y) {
+	public static void _wglUniform2f(IUniformGL uniformIndex, float x, float y) {
 		if(uniformIndex != null) _wglUniform2fN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform2f")
 	public static native void _wglUniform2fN(WebGLUniformLocation uniformIndex, float x, float y);
 
-	public static final void _wglUniform3f(IUniformGL uniformIndex, float x, float y, float z) {
+	public static void _wglUniform3f(IUniformGL uniformIndex, float x, float y, float z) {
 		if(uniformIndex != null) _wglUniform3fN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y, z);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform3f")
 	public static native void _wglUniform3fN(WebGLUniformLocation uniformIndex, float x, float y, float z);
 
-	public static final void _wglUniform4f(IUniformGL uniformIndex, float x, float y, float z, float w) {
+	public static void _wglUniform4f(IUniformGL uniformIndex, float x, float y, float z, float w) {
 		if(uniformIndex != null) _wglUniform4fN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y, z, w);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform4f")
 	public static native void _wglUniform4fN(WebGLUniformLocation uniformIndex, float x, float y, float z, float w);
 
-	public static final void _wglUniform1i(IUniformGL uniformIndex, int x) {
+	public static void _wglUniform1i(IUniformGL uniformIndex, int x) {
 		if(uniformIndex != null) _wglUniform1iN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform1i")
 	public static native void _wglUniform1iN(WebGLUniformLocation uniformIndex, int x);
 
-	public static final void _wglUniform2i(IUniformGL uniformIndex, int x, int y) {
+	public static void _wglUniform2i(IUniformGL uniformIndex, int x, int y) {
 		if(uniformIndex != null) _wglUniform2iN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform2i")
 	public static native void _wglUniform2iN(WebGLUniformLocation uniformIndex, int x, int y);
 
-	public static final void _wglUniform3i(IUniformGL uniformIndex, int x, int y, int z) {
+	public static void _wglUniform3i(IUniformGL uniformIndex, int x, int y, int z) {
 		if(uniformIndex != null) _wglUniform3iN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y, z);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform3i")
 	public static native void _wglUniform3iN(WebGLUniformLocation uniformIndex, int x, int y, int z);
 
-	public static final void _wglUniform4i(IUniformGL uniformIndex, int x, int y, int z, int w) {
+	public static void _wglUniform4i(IUniformGL uniformIndex, int x, int y, int z, int w) {
 		if(uniformIndex != null) _wglUniform4iN(((OpenGLObjects.UniformGL)uniformIndex).ptr, x, y, z, w);
 	}
 
 	@Import(module = "platformOpenGL", name = "glUniform4i")
 	public static native void _wglUniform4iN(WebGLUniformLocation uniformIndex, int x, int y, int z, int w);
 
-	public static final void _wglUniformMatrix2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix2fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -651,7 +651,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix2fv")
 	static native void _wglUniformMatrix2fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglUniformMatrix3fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix3fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix3fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -660,7 +660,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix3fv")
 	static native void _wglUniformMatrix3fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglUniformMatrix4fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix4fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix4fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -669,7 +669,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix4fv")
 	static native void _wglUniformMatrix4fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglUniformMatrix3x2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix3x2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix3x2fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -678,7 +678,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix3x2fv")
 	static native void _wglUniformMatrix3x2fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglUniformMatrix4x2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix4x2fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix4x2fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -687,7 +687,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix4x2fv")
 	static native void _wglUniformMatrix4x2fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglUniformMatrix4x3fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
+	public static void _wglUniformMatrix4x3fv(IUniformGL uniformIndex, boolean transpose, FloatBuffer buffer) {
 		if (uniformIndex != null)
 			_wglUniformMatrix4x3fvN(((OpenGLObjects.UniformGL) uniformIndex).ptr, transpose,
 					WASMGCBufferAllocator.getFloatBufferView(buffer));
@@ -696,14 +696,14 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glUniformMatrix4x3fv")
 	static native void _wglUniformMatrix4x3fvN(WebGLUniformLocation uniformIndex, boolean transpose, Float32Array typedArray);
 
-	public static final void _wglBindFramebuffer(int target, IFramebufferGL framebuffer) {
+	public static void _wglBindFramebuffer(int target, IFramebufferGL framebuffer) {
 		if(framebuffer == null) {
 			framebuffer = WebGLBackBuffer.getBackBuffer();
 		}
 		_wglBindFramebufferN(target, ((OpenGLObjects.FramebufferGL)framebuffer).ptr);
 	}
 
-	public static final void _wglBindFramebufferLow(int target, IFramebufferGL framebuffer) {
+	public static void _wglBindFramebufferLow(int target, IFramebufferGL framebuffer) {
 		_wglBindFramebufferN(target, framebuffer != null ? ((OpenGLObjects.FramebufferGL)framebuffer).ptr : null);
 	}
 
@@ -720,28 +720,28 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glRenderbufferStorage")
 	public static native void _wglRenderbufferStorage(int target, int internalformat, int width, int height);
 
-	public static final void _wglFramebufferTexture2D(int target, int attachment, int texTarget, ITextureGL texObj, int level) {
+	public static void _wglFramebufferTexture2D(int target, int attachment, int texTarget, ITextureGL texObj, int level) {
 		_wglFramebufferTexture2DN(target, attachment, texTarget, ((OpenGLObjects.TextureGL)texObj).ptr, level);
 	}
 
 	@Import(module = "platformOpenGL", name = "glFramebufferTexture2D")
 	static native void _wglFramebufferTexture2DN(int target, int attachment, int texTarget, WebGLTexture texObj, int level);
 
-	public static final void _wglFramebufferTextureLayer(int target, int attachment, ITextureGL texObj, int level, int layer) {
+	public static void _wglFramebufferTextureLayer(int target, int attachment, ITextureGL texObj, int level, int layer) {
 		_wglFramebufferTextureLayerN(target, attachment, ((OpenGLObjects.TextureGL)texObj).ptr, level, layer);
 	}
 
 	@Import(module = "platformOpenGL", name = "glFramebufferTextureLayer")
 	static native void _wglFramebufferTextureLayerN(int target, int attachment, WebGLTexture texObj, int level, int layer);
 
-	public static final void _wglBindRenderbuffer(int target, IRenderbufferGL renderbuffer) {
+	public static void _wglBindRenderbuffer(int target, IRenderbufferGL renderbuffer) {
 		_wglBindRenderbufferN(target, renderbuffer != null ? ((OpenGLObjects.RenderbufferGL)renderbuffer).ptr : null);
 	}
 
 	@Import(module = "platformOpenGL", name = "glBindRenderbuffer")
 	static native void _wglBindRenderbufferN(int target, WebGLRenderbuffer renderbuffer);
 
-	public static final void _wglFramebufferRenderbuffer(int target, int attachment, int renderbufferTarget,
+	public static void _wglFramebufferRenderbuffer(int target, int attachment, int renderbufferTarget,
 			IRenderbufferGL renderbufferId) {
 		_wglFramebufferRenderbufferN(target, attachment, renderbufferTarget,
 				renderbufferId != null ? ((OpenGLObjects.RenderbufferGL) renderbufferId).ptr : null);
@@ -750,7 +750,7 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glFramebufferRenderbuffer")
 	static native void _wglFramebufferRenderbufferN(int target, int attachment, int renderbufferTarget, WebGLRenderbuffer renderbufferId);
 
-	public static final String _wglGetString(int param) {
+	public static String _wglGetString(int param) {
 		return BetterJSStringConverter.stringFromJS(_wglGetStringN(param));
 	}
 
@@ -763,43 +763,43 @@ public class PlatformOpenGL {
 	@Import(module = "platformOpenGL", name = "glGetError")
 	public static native int _wglGetError();
 
-	public static final int checkOpenGLESVersion() {
+	public static int checkOpenGLESVersion() {
 		return glesVers;
 	}
 
-	public static final boolean checkEXTGPUShader5Capable() {
+	public static boolean checkEXTGPUShader5Capable() {
 		return (capABits & CAP_A_BIT_EXT_GPU_SHADER5) != 0;
 	}
 
-	public static final boolean checkOESGPUShader5Capable() {
+	public static boolean checkOESGPUShader5Capable() {
 		return (capABits & CAP_A_BIT_OES_GPU_SHADER5) != 0;
 	}
 
-	public static final boolean checkFBORenderMipmapCapable() {
+	public static boolean checkFBORenderMipmapCapable() {
 		return (capABits & CAP_A_BIT_FBO_RENDER_MIPMAP) != 0;
 	}
 
-	public static final boolean checkVAOCapable() {
+	public static boolean checkVAOCapable() {
 		return vertexArrayImpl != VAO_IMPL_NONE;
 	}
 
-	public static final boolean checkInstancingCapable() {
+	public static boolean checkInstancingCapable() {
 		return instancingImpl != INSTANCE_IMPL_NONE;
 	}
 
-	public static final boolean checkTexStorageCapable() {
+	public static boolean checkTexStorageCapable() {
 		return glesVers >= 300;
 	}
 
-	public static final boolean checkTextureLODCapable() {
+	public static boolean checkTextureLODCapable() {
 		return (capABits & CAP_A_BIT_TEXTURE_LOD_CAPABLE) != 0;
 	}
 
-	public static final boolean checkNPOTCapable() {
+	public static boolean checkNPOTCapable() {
 		return (capABits & CAP_A_BIT_NPOT_CAPABLE) != 0;
 	}
 
-	public static final boolean checkHDRFramebufferSupport(int bits) {
+	public static boolean checkHDRFramebufferSupport(int bits) {
 		switch(bits) {
 		case 16:
 			return (capABits & CAP_A_BIT_HDR_FBO16F) != 0;
@@ -810,7 +810,7 @@ public class PlatformOpenGL {
 		}
 	}
 
-	public static final boolean checkLinearHDRFilteringSupport(int bits) {
+	public static boolean checkLinearHDRFilteringSupport(int bits) {
 		switch(bits) {
 		case 16:
 			return (capBBits & CAP_B_BIT_HDR_LINEAR16F) != 0;
@@ -822,29 +822,29 @@ public class PlatformOpenGL {
 	}
 
 	// legacy
-	public static final boolean checkLinearHDR32FSupport() {
+	public static boolean checkLinearHDR32FSupport() {
 		return (capBBits & CAP_B_BIT_HDR_LINEAR32F) != 0;
 	}
 
-	public static final boolean checkAnisotropicFilteringSupport() {
+	public static boolean checkAnisotropicFilteringSupport() {
 		return (capABits & CAP_A_BIT_ANISOTROPIC) != 0;
 	}
 
-	public static final String[] getAllExtensions() {
+	public static String[] getAllExtensions() {
 		return BetterJSStringConverter.stringArrayFromJS(getAllExtensions0());
 	}
 
 	@Import(module = "platformOpenGL", name = "getAllExtensions")
 	static native JSArray<JSString> getAllExtensions0();
 
-	public static final List<String> dumpActiveExtensions() {
+	public static List<String> dumpActiveExtensions() {
 		return Arrays.asList(BetterJSStringConverter.stringArrayFromJS(dumpActiveExtensions0()));
 	}
 
 	@Import(module = "platformOpenGL", name = "dumpActiveExtensions")
 	static native JSArray<JSString> dumpActiveExtensions0();
 
-	public static final void enterVAOEmulationHook() {
+	public static void enterVAOEmulationHook() {
 		WebGLBackBuffer.enterVAOEmulationPhase();
 	}
 

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java

@@ -43,9 +43,11 @@ import com.jcraft.jzlib.Inflater;
 import com.jcraft.jzlib.InflaterInputStream;
 
 import net.lax1dude.eaglercraft.v1_8.Filesystem;
+import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
+import net.lax1dude.eaglercraft.v1_8.internal.buffer.MemoryStack;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.WASMGCBufferAllocator;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.WASMGCDirectArrayConverter;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
@@ -75,6 +77,7 @@ public class PlatformRuntime {
 		root = getRootElement();
 		parent = getParentElement();
 		canvas = getCanvasElement();
+		printMemoryStackAddrWASMGC();
 		PlatformApplication.setMCServerWindowGlobal(null);
 		PlatformOpenGL.initContext();
 		PlatformInput.initContext(win, parent, canvas);
@@ -84,29 +87,27 @@ public class PlatformRuntime {
 
 		WebGLBackBuffer.initBackBuffer(PlatformInput.getWindowWidth(), PlatformInput.getWindowHeight());
 
-		HTMLElement el = parent.querySelector("._eaglercraftX_early_splash_element");
-		if(el != null) {
-			el.delete();
-		}
-
-		EarlyLoadScreen.extractingAssetsScreen();
-		sleep(20);
-
 		PlatformAssets.readAssetsTeaVM();
 
 		byte[] finalLoadScreen = PlatformAssets.getResourceBytes("/assets/eagler/eagtek.png");
 
 		if(finalLoadScreen != null) {
+			EarlyLoadScreen.initialize();
 			EarlyLoadScreen.loadFinal(finalLoadScreen);
 			EarlyLoadScreen.paintFinal(false);
+			EarlyLoadScreen.destroy();
 		}else {
 			PlatformOpenGL._wglClearColor(1.0f, 0.0f, 1.0f, 1.0f);
 			PlatformOpenGL._wglClear(RealOpenGLEnums.GL_COLOR_BUFFER_BIT);
 			PlatformInput.update();
 		}
-		sleep(20);
 
-		EarlyLoadScreen.destroy();
+		HTMLElement el = parent.querySelector("._eaglercraftX_early_splash_element");
+		if(el != null) {
+			el.delete();
+		}
+
+		sleep(20);
 
 		logger.info("Initializing filesystem...");
 
@@ -537,4 +538,9 @@ public class PlatformRuntime {
 		return new GZIPInputStream(is);
 	}
 
+	public static void printMemoryStackAddrWASMGC() {
+		logger.info("MemoryStack base: 0x{}, limit: 0x{}", HString.format("%08x", MemoryStack.stackBase.toInt()),
+				HString.format("%08x", MemoryStack.stackMax.toInt()));
+	}
+
 }

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/MemoryStack.java

@@ -44,26 +44,28 @@ public class MemoryStack {
 	}
 
 	public static void push() {
+		Address addr = stackTopPointer.add(8);
+		if(addr.toInt() > stackMax.toInt()) {
+			throw new StackOverflowError();
+		}
 		stackTopPointer.putAddress(stackBottomPointer);
 		stackTopPointer.add(4).putInt(0);
 		stackBottomPointer = stackTopPointer;
-		stackTopPointer = stackBottomPointer.add(8);
-		if(stackTopPointer.toInt() > stackMax.toInt()) {
-			throw new StackOverflowError();
-		}
+		stackTopPointer = addr;
 	}
 
 	public static void pop() {
+		Address addr = stackBottomPointer.getAddress();
+		if(addr.toInt() == 0) {
+			throw new IllegalStateException("MemoryStack underflow");
+		}
 		stackTopPointer = stackBottomPointer;
-		stackBottomPointer = stackTopPointer.getAddress();
+		stackBottomPointer = addr;
 		Address cleanup = stackTopPointer.add(4).getAddress();
 		while(cleanup.toInt() != 0) {
 			WASMGCBufferAllocator.free(cleanup.getAddress());
 			cleanup = cleanup.add(4).getAddress();
 		}
-		if(stackBottomPointer.toInt() == 0) {
-			throw new IllegalStateException("MemoryStack underflow");
-		}
 	}
 
 	public static Address malloc(int length) {
@@ -98,7 +100,7 @@ public class MemoryStack {
 	}
 
 	public static Address calloc(int length) {
-		if(length > MALLOC_THRESHOLD || (stackMax.toInt() - stackTopPointer.toInt()) < RESERVE_SIZE) {
+		if(length > MALLOC_THRESHOLD || (stackMax.toInt() - stackTopPointer.toInt() - length) < RESERVE_SIZE) {
 			if(stackTopPointer.toInt() + 8 > stackMax.toInt()) {
 				throw new StackOverflowError();
 			}

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/wasm_gc_teavm/EarlyLoadScreen.java

@@ -19,15 +19,13 @@ package net.lax1dude.eaglercraft.v1_8.internal.wasm_gc_teavm;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-import net.lax1dude.eaglercraft.v1_8.Base64;
-import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IVertexArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.ITextureGL;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformAssets;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.MemoryStack;
@@ -36,38 +34,16 @@ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 
 public class EarlyLoadScreen {
 
-	public static final String loadScreen = "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";
-
 	private static IBufferGL vbo = null;
 	private static IProgramGL program = null;
 	private static ITextureGL finalTexture = null;
 
-	public static void extractingAssetsScreen() {
+	public static void initialize() {
 		boolean gles3 = checkOpenGLESVersion() >= 300;
-		boolean vaos = checkVAOCapable();
 
-		// create textures:
-		
-		ITextureGL tex = _wglGenTextures();
-		_wglActiveTexture(GL_TEXTURE0);
-		_wglBindTexture(GL_TEXTURE_2D, tex);
-		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		_wglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-		
-		ImageData img = PlatformAssets.loadImageFile(Base64.decodeBase64(loadScreen));
 		MemoryStack.push();
 		try {
-			ByteBuffer upload = MemoryStack.mallocByteBuffer(192*192*4);
-			IntBuffer pixelUpload = upload.asIntBuffer();
-			pixelUpload.put(img.pixels);
-			pixelUpload.flip();
-			_wglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 192, 192, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixelUpload);
-			
-			// create vertex buffer:
-			
-			FloatBuffer vertexUpload = upload.asFloatBuffer();
+			FloatBuffer vertexUpload = MemoryStack.mallocFloatBuffer(12);
 			vertexUpload.clear();
 			vertexUpload.put(0.0f); vertexUpload.put(0.0f);
 			vertexUpload.put(0.0f); vertexUpload.put(1.0f);
@@ -83,8 +59,6 @@ public class EarlyLoadScreen {
 		}finally {
 			MemoryStack.pop();
 		}
-
-		// compile the splash shader:
 		
 		IShaderGL vert = _wglCreateShader(GL_VERTEX_SHADER);
 		_wglShaderSource(vert, gles3
@@ -113,48 +87,6 @@ public class EarlyLoadScreen {
 		
 		_wglUseProgram(program);
 		_wglUniform1i(_wglGetUniformLocation(program, "tex"), 0);
-
-		int width = PlatformInput.getWindowWidth();
-		int height = PlatformInput.getWindowHeight();
-		float x, y;
-		if(width > height) {
-			x = (float)width / (float)height;
-			y = 1.0f;
-		}else {
-			x = 1.0f;
-			y = (float)height / (float)width;
-		}
-		
-		_wglActiveTexture(GL_TEXTURE0);
-		_wglBindTexture(GL_TEXTURE_2D, tex);
-		
-		_wglViewport(0, 0, width, height);
-		_wglClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-		_wglClear(GL_COLOR_BUFFER_BIT);
-
-		_wglUseProgram(program);
-		_wglUniform2f(_wglGetUniformLocation(program, "aspect"), x, y);
-		
-		IBufferArrayGL vao = null;
-		if(vaos) {
-			vao = _wglGenVertexArrays();
-			_wglBindVertexArray(vao);
-		}
-		_wglEnableVertexAttribArray(0);
-		_wglVertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
-		_wglDrawArrays(GL_TRIANGLES, 0, 6);
-		
-		_wglDisableVertexAttribArray(0);
-		
-		PlatformInput.update();
-
-		_wglUseProgram(null);
-		_wglBindBuffer(GL_ARRAY_BUFFER, null);
-		_wglBindTexture(GL_TEXTURE_2D, null);
-		_wglDeleteTextures(tex);
-		if(vaos) {
-			_wglDeleteVertexArrays(vao);
-		}
 	}
 
 	public static void loadFinal(byte[] finalLoadScreen) {
@@ -207,11 +139,11 @@ public class EarlyLoadScreen {
 		
 		_wglUniform2f(_wglGetUniformLocation(program, "aspect"), x, y);
 
-		IBufferArrayGL vao = null;
+		IVertexArrayGL vao = null;
 		if(vaos) {
 			if(softVAOs) {
-				vao = EaglercraftGPU.createGLBufferArray();
-				EaglercraftGPU.bindGLBufferArray(vao);
+				vao = EaglercraftGPU.createGLVertexArray();
+				EaglercraftGPU.bindGLVertexArray(vao);
 			}else {
 				vao = _wglGenVertexArrays();
 				_wglBindVertexArray(vao);
@@ -221,7 +153,7 @@ public class EarlyLoadScreen {
 			EaglercraftGPU.bindVAOGLArrayBuffer(vbo);
 			EaglercraftGPU.enableVertexAttribArray(0);
 			EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
-			EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
+			EaglercraftGPU.drawArrays(GL_TRIANGLES, 0, 6);
 		}else {
 			_wglBindBuffer(GL_ARRAY_BUFFER, vbo);
 			_wglEnableVertexAttribArray(0);
@@ -245,7 +177,7 @@ public class EarlyLoadScreen {
 		}
 		if(vaos) {
 			if(softVAOs) {
-				EaglercraftGPU.destroyGLBufferArray(vao);
+				EaglercraftGPU.destroyGLVertexArray(vao);
 			}else {
 				_wglDeleteVertexArrays(vao);
 			}

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/wasm_gc_teavm/WASMGCWebSocketClient.java

@@ -69,6 +69,10 @@ public class WASMGCWebSocketClient implements IWebSocketClient {
 
 		void clearBinaryFrames();
 
+		void setEnableStringFrames(boolean enable);
+
+		void setEnableBinaryFrames(boolean enable);
+
 	}
 
 	private final JSWebSocketClientHandle handle;
@@ -239,4 +243,14 @@ public class WASMGCWebSocketClient implements IWebSocketClient {
 		return uri;
 	}
 
+	@Override
+	public void setEnableStringFrames(boolean enable) {
+		handle.setEnableStringFrames(enable);
+	}
+
+	@Override
+	public void setEnableBinaryFrames(boolean enable) {
+		handle.setEnableBinaryFrames(enable);
+	}
+
 }

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/internal/wasm_gc_teavm/WebGLBackBuffer.java

@@ -19,13 +19,13 @@ package net.lax1dude.eaglercraft.v1_8.internal.wasm_gc_teavm;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IRenderbufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.ITextureGL;
+import net.lax1dude.eaglercraft.v1_8.internal.IVertexArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.MemoryStack;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
@@ -47,7 +47,7 @@ public class WebGLBackBuffer {
 	private static ITextureGL gles2ColorTexture;
 	private static IRenderbufferGL gles2DepthRenderbuffer;
 	private static IProgramGL gles2BlitProgram;
-	private static IBufferArrayGL gles2BlitVAO;
+	private static IVertexArrayGL gles2BlitVAO;
 	private static IBufferGL gles2BlitVBO;
 
 	private static boolean isVAOCapable = false;
@@ -161,8 +161,8 @@ public class WebGLBackBuffer {
 				if(isVAOCapable) {
 					_wglDeleteVertexArrays(gles2BlitVAO);
 				}
-				gles2BlitVAO = EaglercraftGPU.createGLBufferArray();
-				EaglercraftGPU.bindGLBufferArray(gles2BlitVAO);
+				gles2BlitVAO = EaglercraftGPU.createGLVertexArray();
+				EaglercraftGPU.bindGLVertexArray(gles2BlitVAO);
 				EaglercraftGPU.bindVAOGLArrayBuffer(gles2BlitVBO);
 				EaglercraftGPU.enableVertexAttribArray(0);
 				EaglercraftGPU.vertexAttribPointer(0, 2, GL_FLOAT, false, 8, 0);
@@ -173,8 +173,8 @@ public class WebGLBackBuffer {
 
 	private static void drawBlitQuad() {
 		if(isEmulatedVAOPhase) {
-			EaglercraftGPU.bindGLBufferArray(gles2BlitVAO);
-			EaglercraftGPU.doDrawArrays(GL_TRIANGLES, 0, 6);
+			EaglercraftGPU.bindGLVertexArray(gles2BlitVAO);
+			EaglercraftGPU.drawArrays(GL_TRIANGLES, 0, 6);
 		}else {
 			if(isVAOCapable) {
 				_wglBindVertexArray(gles2BlitVAO);
@@ -282,7 +282,7 @@ public class WebGLBackBuffer {
 		}
 		if(gles2BlitVAO != null) {
 			if(isEmulatedVAOPhase) {
-				EaglercraftGPU.destroyGLBufferArray(gles2BlitVAO);
+				EaglercraftGPU.destroyGLVertexArray(gles2BlitVAO);
 			}else if(isVAOCapable) {
 				_wglDeleteVertexArrays(gles2BlitVAO);
 			}

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java

@@ -32,6 +32,7 @@ import net.lax1dude.eaglercraft.v1_8.Filesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.IEaglerFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.MemoryStack;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.WASMGCDirectArrayConverter;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
@@ -50,6 +51,7 @@ public class ServerPlatformSingleplayer {
 	private static IEaglerFilesystem filesystem = null;
 
 	public static void initializeContext() {
+		PlatformRuntime.printMemoryStackAddrWASMGC();
 		singleThreadMode = false;
 		singleThreadCB = null;
 		filesystem = Filesystem.getHandleFor(getClientConfigAdapter().getWorldsDB());

sources/wasm-gc-teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/wasm_gc_teavm/WorkerMain.java

@@ -35,6 +35,7 @@ public class WorkerMain {
 		PrintStream systemOut = System.out;
 		PrintStream systemErr = System.err;
 		try {
+			PlatformRuntime.setThreadName("IntegratedServer");
 			systemOut.println("WorkerMain: [INFO] eaglercraftx worker thread is starting...");
 			JSObject startArgs = getEaglerXOpts();
 			systemOut.println("WorkerMain: [INFO] reading configuration");
@@ -42,7 +43,6 @@ public class WorkerMain {
 			systemOut.println("WorkerMain: [INFO] initializing server runtime");
 			ServerPlatformSingleplayer.initializeContext();
 			systemOut.println("WorkerMain: [INFO] starting worker thread");
-			PlatformRuntime.setThreadName("IntegratedServer");
 			EaglerIntegratedServerWorker.serverMain();
 		}catch(Throwable t) {
 			System.setOut(systemOut);