Enhance texture error reporting & clean up

Author: Artem Kholodnyi

library/src/main/java/com/yalantis/starwars/utils/gl/TextureHelper.java

@@ -1,10 +1,11 @@
 package com.yalantis.starwars.utils.gl;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.opengl.GLES20;
 import android.opengl.GLUtils;
 
+import timber.log.Timber;
+
 import static android.opengl.GLES20.GL_CLAMP_TO_EDGE;
 import static android.opengl.GLES20.GL_NEAREST;
 import static android.opengl.GLES20.GL_TEXTURE_2D;
@@ -17,12 +18,6 @@
 import static android.opengl.GLES20.glTexParameteri;
 
 public class TextureHelper {
-	public static int loadTexture(final Context context, final int resourceId) {
-		final BitmapFactory.Options options = new BitmapFactory.Options();
-		options.inScaled = false;	// No pre-scaling
-		final Bitmap bitmap = BitmapFactory.decodeResource(context.getResources(), resourceId, options);
-		return loadTexture(bitmap);
-	}
 
 	public static int loadTexture(final Bitmap bitmap) {
 		final int[] textureHandle = new int[1];
@@ -42,49 +37,17 @@ public static int loadTexture(final Bitmap bitmap) {
 			// Load the bitmap into the bound texture.
 			GLUtils.texImage2D(GL_TEXTURE_2D, 0, bitmap, 0);
 
-//			Buffer byteBuffer = ByteBuffer.allocate(bitmap.getByteCount());
-//			bitmap.copyPixelsToBuffer(byteBuffer);
-//			glTexImage2D(GL_TEXTURE_2D, 0, GLES20.GL_RGB, bitmap.getWidth(), bitmap.getHeight(),
-//					0, GLES20.GL_RGB, GLES20.GL_UNSIGNED_BYTE, byteBuffer);
-
 			// Recycle the bitmap, since its data has been loaded into OpenGL.
 			bitmap.recycle();
 		} else {
-			throw new RuntimeException("Error loading texture.");
+			int errorCode = GLES20.glGetError();
+            String errorString = GLUtils.getEGLErrorString(errorCode);
+            RuntimeException e = new RuntimeException(errorCode + " " + errorString);
+			Timber.e(e, "");
+			throw e;
 		}
 
 		return textureHandle[0];
 	}
 
-	public static int loadTexture2(final Bitmap bitmap) {
-		final int[] textureHandle = new int[1];
-
-		glGenTextures(1, textureHandle, 0);
-
-		if (textureHandle[0] != 0) {
-			// Bind to the texture in OpenGL
-			glBindTexture(GL_TEXTURE_2D, textureHandle[0]);
-
-			// Set filtering
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-			// Load the bitmap into the bound texture.
-			GLUtils.texSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bitmap);
-
-//			Buffer byteBuffer = ByteBuffer.allocate(bitmap.getByteCount());
-//			bitmap.copyPixelsToBuffer(byteBuffer);
-//			glTexImage2D(GL_TEXTURE_2D, 0, GLES20.GL_RGB, bitmap.getWidth(), bitmap.getHeight(),
-//					0, GLES20.GL_RGB, GLES20.GL_UNSIGNED_BYTE, byteBuffer);
-
-			// Recycle the bitmap, since its data has been loaded into OpenGL.
-			bitmap.recycle();
-		} else {
-			throw new RuntimeException("Error loading texture.");
-		}
-
-		return textureHandle[0];
-	}
 }