| Index: talk/app/webrtc/java/android/org/webrtc/GlShader.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/GlShader.java b/talk/app/webrtc/java/android/org/webrtc/GlShader.java
|
| index 966f0f5794aa526b05c4701991abb9d1255431e9..3014aab407e81f75b1c6e0097774a83633a0d62c 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/GlShader.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/GlShader.java
|
| @@ -28,8 +28,7 @@
|
| package org.webrtc;
|
|
|
| import android.opengl.GLES20;
|
| -
|
| -import org.webrtc.Logging;
|
| +import android.util.Log;
|
|
|
| import java.nio.FloatBuffer;
|
|
|
| @@ -46,7 +45,7 @@ public class GlShader {
|
| GLES20.glCompileShader(shader);
|
| GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
|
| if (result[0] != GLES20.GL_TRUE) {
|
| - Logging.e(TAG, "Could not compile shader " + shaderType + ":" +
|
| + Log.e(TAG, "Could not compile shader " + shaderType + ":" +
|
| GLES20.glGetShaderInfoLog(shader));
|
| throw new RuntimeException(GLES20.glGetShaderInfoLog(shader));
|
| }
|
| @@ -73,7 +72,7 @@ public class GlShader {
|
| };
|
| GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
|
| if (linkStatus[0] != GLES20.GL_TRUE) {
|
| - Logging.e(TAG, "Could not link program: " +
|
| + Log.e(TAG, "Could not link program: " +
|
| GLES20.glGetProgramInfoLog(program));
|
| throw new RuntimeException(GLES20.glGetProgramInfoLog(program));
|
| }
|
| @@ -125,7 +124,7 @@ public class GlShader {
|
| }
|
|
|
| public void release() {
|
| - Logging.d(TAG, "Deleting shader.");
|
| + Log.d(TAG, "Deleting shader.");
|
| // Flag shaders for deletion (does not delete until no longer attached to a program).
|
| if (vertexShader != -1) {
|
| GLES20.glDeleteShader(vertexShader);
|
|
|