Preparing 0.9.2a release

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="org.love2d.android"
-      android:versionCode="15"
-      android:versionName="0.9.2"
+      android:versionCode="16"
+      android:versionName="0.9.2a"
       android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE"/>

README.md

@@ -40,6 +40,7 @@ Changelog:
 ----------
 
 0.9.2:
+
 * updated API to match that of LÖVE 0.9.2
 * love.window.setFullscreen can be used to switch between regular and immersive mode without status and navbar
 * added loading of games by opening a main.lua file

jni/love/src/libraries/glad/glad.hpp

@@ -143,10 +143,10 @@ typedef uint64_t GLuint64EXT;
 typedef struct __GLsync *GLsync;
 struct _cl_context;
 struct _cl_event;
-typedef void ( *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void ( *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void ( *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void ( *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
+typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
 typedef unsigned short GLhalfNV;
 typedef GLintptr GLvdpauSurfaceNV;
 

jni/love/src/modules/graphics/opengl/Image.cpp

@@ -460,14 +460,19 @@ void Image::uploadTexturePadded()
 	}
 	else if (data.get())
 	{
+		GLenum xformat = GL_RGBA;
 		GLenum iformat = (format == FORMAT_SRGB) ? GL_SRGB_ALPHA : GL_RGBA;
+
+		if (GLAD_ES_VERSION_2_0 && !GLAD_ES_VERSION_3_0)
+			xformat = iformat;
+
 		glTexImage2D(GL_TEXTURE_2D,
 		             0,
 		             iformat,
 		             (GLsizei)paddedWidth,
 		             (GLsizei)paddedHeight,
 		             0,
-		             GL_RGBA,
+		             xformat,
 		             GL_UNSIGNED_BYTE,
 		             0);
 
@@ -476,7 +481,7 @@ void Image::uploadTexturePadded()
 		                0, 0,
 		                (GLsizei)width,
 		                (GLsizei)height,
-		                GL_RGBA,
+		                xformat,
 		                GL_UNSIGNED_BYTE,
 		                data->getData());
 	}
@@ -498,14 +503,20 @@ void Image::uploadTexture()
 	}
 	else if (data.get())
 	{
+		GLenum xformat = GL_RGBA;
 		GLenum iformat = (format == FORMAT_SRGB) ? GL_SRGB_ALPHA : GL_RGBA;
+
+		// The internal and external format parameters must match in OpenGL ES 2.
+		if (GLAD_ES_VERSION_2_0 && !GLAD_ES_VERSION_3_0)
+			xformat = iformat;
+
 		glTexImage2D(GL_TEXTURE_2D,
 		             0,
 		             iformat,
 		             (GLsizei)width,
 		             (GLsizei)height,
 		             0,
-		             GL_RGBA,
+		             xformat,
 		             GL_UNSIGNED_BYTE,
 		             data->getData());
 	}

jni/love/src/modules/graphics/opengl/ParticleSystem.cpp

@@ -113,6 +113,7 @@ ParticleSystem::ParticleSystem(const ParticleSystem &p)
 	, pHead(nullptr)
 	, pTail(nullptr)
 	, particleVerts(nullptr)
+	, ibo(nullptr)
 	, texture(p.texture)
 	, active(p.active)
 	, insertMode(p.insertMode)