| Index: talk/app/webrtc/java/android/org/webrtc/GlUtil.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/GlUtil.java b/talk/app/webrtc/java/android/org/webrtc/GlUtil.java
|
| deleted file mode 100644
|
| index 8b4357969dfe014440cedc65daea5e4575a5eb20..0000000000000000000000000000000000000000
|
| --- a/talk/app/webrtc/java/android/org/webrtc/GlUtil.java
|
| +++ /dev/null
|
| @@ -1,75 +0,0 @@
|
| -/*
|
| - * libjingle
|
| - * Copyright 2015 Google Inc.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -package org.webrtc;
|
| -
|
| -import android.opengl.GLES20;
|
| -
|
| -import java.nio.ByteBuffer;
|
| -import java.nio.ByteOrder;
|
| -import java.nio.FloatBuffer;
|
| -
|
| -/**
|
| - * Some OpenGL static utility functions.
|
| - */
|
| -public class GlUtil {
|
| - private GlUtil() {}
|
| -
|
| - // Assert that no OpenGL ES 2.0 error has been raised.
|
| - public static void checkNoGLES2Error(String msg) {
|
| - int error = GLES20.glGetError();
|
| - if (error != GLES20.GL_NO_ERROR) {
|
| - throw new RuntimeException(msg + ": GLES20 error: " + error);
|
| - }
|
| - }
|
| -
|
| - public static FloatBuffer createFloatBuffer(float[] coords) {
|
| - // Allocate a direct ByteBuffer, using 4 bytes per float, and copy coords into it.
|
| - ByteBuffer bb = ByteBuffer.allocateDirect(coords.length * 4);
|
| - bb.order(ByteOrder.nativeOrder());
|
| - FloatBuffer fb = bb.asFloatBuffer();
|
| - fb.put(coords);
|
| - fb.position(0);
|
| - return fb;
|
| - }
|
| -
|
| - /**
|
| - * Generate texture with standard parameters.
|
| - */
|
| - public static int generateTexture(int target) {
|
| - final int textureArray[] = new int[1];
|
| - GLES20.glGenTextures(1, textureArray, 0);
|
| - final int textureId = textureArray[0];
|
| - GLES20.glBindTexture(target, textureId);
|
| - GLES20.glTexParameterf(target, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
|
| - GLES20.glTexParameterf(target, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
|
| - GLES20.glTexParameterf(target, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
|
| - GLES20.glTexParameterf(target, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
|
| - checkNoGLES2Error("generateTexture");
|
| - return textureId;
|
| - }
|
| -}
|
|
|