Simplify GL program handling.
PiperOrigin-RevId: 400697945
This commit is contained in:
parent
7383bf7696
commit
9788750ddb
@ -15,6 +15,8 @@
|
||||
*/
|
||||
package com.google.android.exoplayer2.gldemo;
|
||||
|
||||
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Bitmap;
|
||||
@ -26,7 +28,6 @@ import android.opengl.GLES20;
|
||||
import android.opengl.GLUtils;
|
||||
import androidx.annotation.Nullable;
|
||||
import com.google.android.exoplayer2.C;
|
||||
import com.google.android.exoplayer2.util.Assertions;
|
||||
import com.google.android.exoplayer2.util.GlUtil;
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
@ -49,7 +50,7 @@ import javax.microedition.khronos.opengles.GL10;
|
||||
private final Bitmap logoBitmap;
|
||||
private final Canvas overlayCanvas;
|
||||
|
||||
private int program;
|
||||
@Nullable private GlUtil.Program program;
|
||||
@Nullable private GlUtil.Attribute[] attributes;
|
||||
@Nullable private GlUtil.Uniform[] uniforms;
|
||||
|
||||
@ -77,27 +78,40 @@ import javax.microedition.khronos.opengles.GL10;
|
||||
|
||||
@Override
|
||||
public void initialize() {
|
||||
String vertexShaderCode;
|
||||
String fragmentShaderCode;
|
||||
try {
|
||||
vertexShaderCode = GlUtil.loadAsset(context, "bitmap_overlay_video_processor_vertex.glsl");
|
||||
fragmentShaderCode =
|
||||
GlUtil.loadAsset(context, "bitmap_overlay_video_processor_fragment.glsl");
|
||||
program =
|
||||
new GlUtil.Program(
|
||||
context,
|
||||
/* vertexShaderFilePath= */ "bitmap_overlay_video_processor_vertex.glsl",
|
||||
/* fragmentShaderFilePath= */ "bitmap_overlay_video_processor_fragment.glsl");
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
program = GlUtil.compileProgram(vertexShaderCode, fragmentShaderCode);
|
||||
GlUtil.Attribute[] attributes = GlUtil.getAttributes(program);
|
||||
GlUtil.Uniform[] uniforms = GlUtil.getUniforms(program);
|
||||
program.use();
|
||||
GlUtil.Attribute[] attributes = program.getAttributes();
|
||||
for (GlUtil.Attribute attribute : attributes) {
|
||||
if (attribute.name.equals("a_position")) {
|
||||
attribute.setBuffer(new float[] {-1, -1, 0, 1, 1, -1, 0, 1, -1, 1, 0, 1, 1, 1, 0, 1}, 4);
|
||||
attribute.setBuffer(
|
||||
new float[] {
|
||||
-1, -1, 0, 1,
|
||||
1, -1, 0, 1,
|
||||
-1, 1, 0, 1,
|
||||
1, 1, 0, 1
|
||||
},
|
||||
4);
|
||||
} else if (attribute.name.equals("a_texcoord")) {
|
||||
attribute.setBuffer(new float[] {0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1}, 4);
|
||||
attribute.setBuffer(
|
||||
new float[] {
|
||||
0, 0, 0, 1,
|
||||
1, 0, 0, 1,
|
||||
0, 1, 0, 1,
|
||||
1, 1, 0, 1
|
||||
},
|
||||
4);
|
||||
}
|
||||
}
|
||||
this.attributes = attributes;
|
||||
this.uniforms = uniforms;
|
||||
this.uniforms = checkNotNull(program).getUniforms();
|
||||
GLES20.glGenTextures(1, textures, 0);
|
||||
GLES20.glBindTexture(GL10.GL_TEXTURE_2D, textures[0]);
|
||||
GLES20.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER, GL10.GL_NEAREST);
|
||||
@ -126,9 +140,8 @@ import javax.microedition.khronos.opengles.GL10;
|
||||
GlUtil.checkGlError();
|
||||
|
||||
// Run the shader program.
|
||||
GlUtil.Uniform[] uniforms = Assertions.checkNotNull(this.uniforms);
|
||||
GlUtil.Attribute[] attributes = Assertions.checkNotNull(this.attributes);
|
||||
GLES20.glUseProgram(program);
|
||||
GlUtil.Uniform[] uniforms = checkNotNull(this.uniforms);
|
||||
GlUtil.Attribute[] attributes = checkNotNull(this.attributes);
|
||||
for (GlUtil.Uniform uniform : uniforms) {
|
||||
switch (uniform.name) {
|
||||
case "tex_sampler_0":
|
||||
|
@ -54,6 +54,160 @@ public final class GlUtil {
|
||||
/** Thrown when the required EGL version is not supported by the device. */
|
||||
public static final class UnsupportedEglVersionException extends Exception {}
|
||||
|
||||
/** GL program. */
|
||||
public static final class Program {
|
||||
/** The identifier of a compiled and linked GLSL shader program. */
|
||||
private final int programId;
|
||||
|
||||
/**
|
||||
* Compiles a GL shader program from vertex and fragment shader code.
|
||||
*
|
||||
* @param vertexShaderCode GLES20 vertex shader program.
|
||||
* @param fragmentShaderCode GLES20 fragment shader program.
|
||||
*/
|
||||
public Program(String vertexShaderCode, String fragmentShaderCode) {
|
||||
programId = GLES20.glCreateProgram();
|
||||
checkGlError();
|
||||
|
||||
// Add the vertex and fragment shaders.
|
||||
addShader(GLES20.GL_VERTEX_SHADER, vertexShaderCode);
|
||||
addShader(GLES20.GL_FRAGMENT_SHADER, fragmentShaderCode);
|
||||
|
||||
// Link and check for errors.
|
||||
GLES20.glLinkProgram(programId);
|
||||
int[] linkStatus = new int[] {GLES20.GL_FALSE};
|
||||
GLES20.glGetProgramiv(programId, GLES20.GL_LINK_STATUS, linkStatus, 0);
|
||||
if (linkStatus[0] != GLES20.GL_TRUE) {
|
||||
throwGlException(
|
||||
"Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(programId));
|
||||
}
|
||||
checkGlError();
|
||||
}
|
||||
|
||||
/**
|
||||
* Compiles a GL shader program from vertex and fragment shader code.
|
||||
*
|
||||
* @param context The {@link Context}.
|
||||
* @param vertexShaderFilePath The path to a GLES20 vertex shader program.
|
||||
* @param fragmentShaderFilePath The path to a fragment shader program.
|
||||
* @throws IOException When failing to read the shader files.
|
||||
*/
|
||||
public Program(Context context, String vertexShaderFilePath, String fragmentShaderFilePath)
|
||||
throws IOException {
|
||||
this(loadAsset(context, vertexShaderFilePath), loadAsset(context, fragmentShaderFilePath));
|
||||
}
|
||||
|
||||
/**
|
||||
* Compiles a GL shader program from vertex and fragment shader code.
|
||||
*
|
||||
* @param vertexShaderCode GLES20 vertex shader program as arrays of strings. Strings are joined
|
||||
* by adding a new line character in between each of them.
|
||||
* @param fragmentShaderCode GLES20 fragment shader program as arrays of strings. Strings are
|
||||
* joined by adding a new line character in between each of them.
|
||||
*/
|
||||
public Program(String[] vertexShaderCode, String[] fragmentShaderCode) {
|
||||
this(TextUtils.join("\n", vertexShaderCode), TextUtils.join("\n", fragmentShaderCode));
|
||||
}
|
||||
|
||||
/** Uses the program. */
|
||||
public void use() {
|
||||
GLES20.glUseProgram(programId);
|
||||
}
|
||||
|
||||
/** Deletes the program. Deleted programs cannot be used again. */
|
||||
public void delete() {
|
||||
GLES20.glDeleteProgram(programId);
|
||||
}
|
||||
|
||||
/** Returns the location of an {@link Attribute}. */
|
||||
public int glGetAttribLocation(String attributeName) {
|
||||
return GLES20.glGetAttribLocation(programId, attributeName);
|
||||
}
|
||||
|
||||
/** Returns the location of a {@link Uniform}. */
|
||||
public int glGetUniformLocation(String uniformName) {
|
||||
return GLES20.glGetUniformLocation(programId, uniformName);
|
||||
}
|
||||
|
||||
/** Returns the program's {@link Attribute}s. */
|
||||
public Attribute[] getAttributes() {
|
||||
int[] attributeCount = new int[1];
|
||||
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_ATTRIBUTES, attributeCount, 0);
|
||||
if (attributeCount[0] != 2) {
|
||||
throw new IllegalStateException("Expected two attributes.");
|
||||
}
|
||||
|
||||
Attribute[] attributes = new Attribute[attributeCount[0]];
|
||||
for (int i = 0; i < attributeCount[0]; i++) {
|
||||
attributes[i] = createAttribute(i);
|
||||
}
|
||||
return attributes;
|
||||
}
|
||||
|
||||
/** Returns the program's {@link Uniform}s. */
|
||||
public Uniform[] getUniforms() {
|
||||
int[] uniformCount = new int[1];
|
||||
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_UNIFORMS, uniformCount, 0);
|
||||
|
||||
Uniform[] uniforms = new Uniform[uniformCount[0]];
|
||||
for (int i = 0; i < uniformCount[0]; i++) {
|
||||
uniforms[i] = createUniform(i);
|
||||
}
|
||||
|
||||
return uniforms;
|
||||
}
|
||||
|
||||
private Uniform createUniform(int index) {
|
||||
int[] length = new int[1];
|
||||
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_UNIFORM_MAX_LENGTH, length, 0);
|
||||
|
||||
int[] type = new int[1];
|
||||
int[] size = new int[1];
|
||||
byte[] name = new byte[length[0]];
|
||||
int[] ignore = new int[1];
|
||||
|
||||
GLES20.glGetActiveUniform(programId, index, length[0], ignore, 0, size, 0, type, 0, name, 0);
|
||||
String nameString = new String(name, 0, strlen(name));
|
||||
int location = glGetAttribLocation(nameString);
|
||||
int typeInt = type[0];
|
||||
|
||||
return new Uniform(nameString, location, typeInt);
|
||||
}
|
||||
|
||||
private Attribute createAttribute(int index) {
|
||||
int[] length = new int[1];
|
||||
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, length, 0);
|
||||
|
||||
int[] type = new int[1];
|
||||
int[] size = new int[1];
|
||||
byte[] nameBytes = new byte[length[0]];
|
||||
int[] ignore = new int[1];
|
||||
|
||||
GLES20.glGetActiveAttrib(
|
||||
programId, index, length[0], ignore, 0, size, 0, type, 0, nameBytes, 0);
|
||||
String name = new String(nameBytes, 0, strlen(nameBytes));
|
||||
int location = glGetAttribLocation(name);
|
||||
|
||||
return new Attribute(name, index, location);
|
||||
}
|
||||
|
||||
private void addShader(int type, String shaderCode) {
|
||||
int shader = GLES20.glCreateShader(type);
|
||||
GLES20.glShaderSource(shader, shaderCode);
|
||||
GLES20.glCompileShader(shader);
|
||||
|
||||
int[] result = new int[] {GLES20.GL_FALSE};
|
||||
GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
|
||||
if (result[0] != GLES20.GL_TRUE) {
|
||||
throwGlException(GLES20.glGetShaderInfoLog(shader) + ", source: " + shaderCode);
|
||||
}
|
||||
|
||||
GLES20.glAttachShader(programId, shader);
|
||||
GLES20.glDeleteShader(shader);
|
||||
checkGlError();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* GL attribute, which can be attached to a buffer with {@link Attribute#setBuffer(float[], int)}.
|
||||
*/
|
||||
@ -68,26 +222,11 @@ public final class GlUtil {
|
||||
@Nullable private Buffer buffer;
|
||||
private int size;
|
||||
|
||||
/**
|
||||
* Creates a new GL attribute.
|
||||
*
|
||||
* @param program The identifier of a compiled and linked GLSL shader program.
|
||||
* @param index The index of the attribute. After this instance has been constructed, the name
|
||||
* of the attribute is available via the {@link #name} field.
|
||||
*/
|
||||
public Attribute(int program, int index) {
|
||||
int[] len = new int[1];
|
||||
GLES20.glGetProgramiv(program, GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, len, 0);
|
||||
|
||||
int[] type = new int[1];
|
||||
int[] size = new int[1];
|
||||
byte[] nameBytes = new byte[len[0]];
|
||||
int[] ignore = new int[1];
|
||||
|
||||
GLES20.glGetActiveAttrib(program, index, len[0], ignore, 0, size, 0, type, 0, nameBytes, 0);
|
||||
name = new String(nameBytes, 0, strlen(nameBytes));
|
||||
location = GLES20.glGetAttribLocation(program, name);
|
||||
/** Creates a new GL attribute. */
|
||||
public Attribute(String name, int index, int location) {
|
||||
this.name = name;
|
||||
this.index = index;
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -137,28 +276,12 @@ public final class GlUtil {
|
||||
private int texId;
|
||||
private int unit;
|
||||
|
||||
/**
|
||||
* Creates a new GL uniform.
|
||||
*
|
||||
* @param program The identifier of a compiled and linked GLSL shader program.
|
||||
* @param index The index of the uniform. After this instance has been constructed, the name of
|
||||
* the uniform is available via the {@link #name} field.
|
||||
*/
|
||||
public Uniform(int program, int index) {
|
||||
int[] len = new int[1];
|
||||
GLES20.glGetProgramiv(program, GLES20.GL_ACTIVE_UNIFORM_MAX_LENGTH, len, 0);
|
||||
|
||||
int[] type = new int[1];
|
||||
int[] size = new int[1];
|
||||
byte[] name = new byte[len[0]];
|
||||
int[] ignore = new int[1];
|
||||
|
||||
GLES20.glGetActiveUniform(program, index, len[0], ignore, 0, size, 0, type, 0, name, 0);
|
||||
this.name = new String(name, 0, strlen(name));
|
||||
location = GLES20.glGetUniformLocation(program, this.name);
|
||||
this.type = type[0];
|
||||
|
||||
value = new float[16];
|
||||
/** Creates a new GL uniform. */
|
||||
public Uniform(String name, int location, int type) {
|
||||
this.name = name;
|
||||
this.location = location;
|
||||
this.type = type;
|
||||
this.value = new float[16];
|
||||
}
|
||||
|
||||
/**
|
||||
@ -332,74 +455,6 @@ public final class GlUtil {
|
||||
Api17.focusSurface(eglDisplay, eglContext, surface, width, height);
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a GL shader program from vertex and fragment shader code.
|
||||
*
|
||||
* @param vertexCode GLES20 vertex shader program as arrays of strings. Strings are joined by
|
||||
* adding a new line character in between each of them.
|
||||
* @param fragmentCode GLES20 fragment shader program as arrays of strings. Strings are joined by
|
||||
* adding a new line character in between each of them.
|
||||
* @return GLES20 program id.
|
||||
*/
|
||||
public static int compileProgram(String[] vertexCode, String[] fragmentCode) {
|
||||
return compileProgram(TextUtils.join("\n", vertexCode), TextUtils.join("\n", fragmentCode));
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a GL shader program from vertex and fragment shader code.
|
||||
*
|
||||
* @param vertexCode GLES20 vertex shader program.
|
||||
* @param fragmentCode GLES20 fragment shader program.
|
||||
* @return GLES20 program id.
|
||||
*/
|
||||
public static int compileProgram(String vertexCode, String fragmentCode) {
|
||||
int program = GLES20.glCreateProgram();
|
||||
checkGlError();
|
||||
|
||||
// Add the vertex and fragment shaders.
|
||||
addShader(GLES20.GL_VERTEX_SHADER, vertexCode, program);
|
||||
addShader(GLES20.GL_FRAGMENT_SHADER, fragmentCode, program);
|
||||
|
||||
// Link and check for errors.
|
||||
GLES20.glLinkProgram(program);
|
||||
int[] linkStatus = new int[] {GLES20.GL_FALSE};
|
||||
GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
|
||||
if (linkStatus[0] != GLES20.GL_TRUE) {
|
||||
throwGlException("Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(program));
|
||||
}
|
||||
checkGlError();
|
||||
|
||||
return program;
|
||||
}
|
||||
|
||||
/** Returns the {@link Attribute}s in the specified {@code program}. */
|
||||
public static Attribute[] getAttributes(int program) {
|
||||
int[] attributeCount = new int[1];
|
||||
GLES20.glGetProgramiv(program, GLES20.GL_ACTIVE_ATTRIBUTES, attributeCount, 0);
|
||||
if (attributeCount[0] != 2) {
|
||||
throw new IllegalStateException("Expected two attributes.");
|
||||
}
|
||||
|
||||
Attribute[] attributes = new Attribute[attributeCount[0]];
|
||||
for (int i = 0; i < attributeCount[0]; i++) {
|
||||
attributes[i] = new Attribute(program, i);
|
||||
}
|
||||
return attributes;
|
||||
}
|
||||
|
||||
/** Returns the {@link Uniform}s in the specified {@code program}. */
|
||||
public static Uniform[] getUniforms(int program) {
|
||||
int[] uniformCount = new int[1];
|
||||
GLES20.glGetProgramiv(program, GLES20.GL_ACTIVE_UNIFORMS, uniformCount, 0);
|
||||
|
||||
Uniform[] uniforms = new Uniform[uniformCount[0]];
|
||||
for (int i = 0; i < uniformCount[0]; i++) {
|
||||
uniforms[i] = new Uniform(program, i);
|
||||
}
|
||||
|
||||
return uniforms;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a GL texture.
|
||||
*
|
||||
@ -478,22 +533,6 @@ public final class GlUtil {
|
||||
return texId[0];
|
||||
}
|
||||
|
||||
private static void addShader(int type, String source, int program) {
|
||||
int shader = GLES20.glCreateShader(type);
|
||||
GLES20.glShaderSource(shader, source);
|
||||
GLES20.glCompileShader(shader);
|
||||
|
||||
int[] result = new int[] {GLES20.GL_FALSE};
|
||||
GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0);
|
||||
if (result[0] != GLES20.GL_TRUE) {
|
||||
throwGlException(GLES20.glGetShaderInfoLog(shader) + ", source: " + source);
|
||||
}
|
||||
|
||||
GLES20.glAttachShader(program, shader);
|
||||
GLES20.glDeleteShader(shader);
|
||||
checkGlError();
|
||||
}
|
||||
|
||||
private static void throwGlException(String errorMsg) {
|
||||
Log.e(TAG, errorMsg);
|
||||
if (glAssertionsEnabled) {
|
||||
|
@ -15,6 +15,8 @@
|
||||
*/
|
||||
package com.google.android.exoplayer2.video;
|
||||
|
||||
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
|
||||
|
||||
import android.content.Context;
|
||||
import android.opengl.GLES20;
|
||||
import android.opengl.GLSurfaceView;
|
||||
@ -140,7 +142,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
|
||||
// glDrawArrays uses it.
|
||||
private final FloatBuffer[] textureCoords;
|
||||
|
||||
private int program;
|
||||
@Nullable private GlUtil.Program program;
|
||||
private int colorMatrixLocation;
|
||||
|
||||
// Accessed only from the GL thread.
|
||||
@ -161,9 +163,9 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
|
||||
|
||||
@Override
|
||||
public void onSurfaceCreated(GL10 unused, EGLConfig config) {
|
||||
program = GlUtil.compileProgram(VERTEX_SHADER, FRAGMENT_SHADER);
|
||||
GLES20.glUseProgram(program);
|
||||
int posLocation = GLES20.glGetAttribLocation(program, "in_pos");
|
||||
program = new GlUtil.Program(VERTEX_SHADER, FRAGMENT_SHADER);
|
||||
program.use();
|
||||
int posLocation = program.glGetAttribLocation("in_pos");
|
||||
GLES20.glEnableVertexAttribArray(posLocation);
|
||||
GLES20.glVertexAttribPointer(
|
||||
posLocation,
|
||||
@ -172,14 +174,14 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
|
||||
/* normalized= */ false,
|
||||
/* stride= */ 0,
|
||||
TEXTURE_VERTICES);
|
||||
texLocations[0] = GLES20.glGetAttribLocation(program, "in_tc_y");
|
||||
texLocations[0] = checkNotNull(program).glGetAttribLocation("in_tc_y");
|
||||
GLES20.glEnableVertexAttribArray(texLocations[0]);
|
||||
texLocations[1] = GLES20.glGetAttribLocation(program, "in_tc_u");
|
||||
texLocations[1] = checkNotNull(program).glGetAttribLocation("in_tc_u");
|
||||
GLES20.glEnableVertexAttribArray(texLocations[1]);
|
||||
texLocations[2] = GLES20.glGetAttribLocation(program, "in_tc_v");
|
||||
texLocations[2] = checkNotNull(program).glGetAttribLocation("in_tc_v");
|
||||
GLES20.glEnableVertexAttribArray(texLocations[2]);
|
||||
GlUtil.checkGlError();
|
||||
colorMatrixLocation = GLES20.glGetUniformLocation(program, "mColorConversion");
|
||||
colorMatrixLocation = checkNotNull(program).glGetUniformLocation("mColorConversion");
|
||||
GlUtil.checkGlError();
|
||||
setupTextures();
|
||||
GlUtil.checkGlError();
|
||||
@ -296,7 +298,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
|
||||
private void setupTextures() {
|
||||
GLES20.glGenTextures(3, yuvTextures, /* offset= */ 0);
|
||||
for (int i = 0; i < 3; i++) {
|
||||
GLES20.glUniform1i(GLES20.glGetUniformLocation(program, TEXTURE_UNIFORMS[i]), i);
|
||||
GLES20.glUniform1i(checkNotNull(program).glGetUniformLocation(TEXTURE_UNIFORMS[i]), i);
|
||||
GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + i);
|
||||
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, yuvTextures[i]);
|
||||
GLES20.glTexParameterf(
|
||||
|
@ -15,6 +15,7 @@
|
||||
*/
|
||||
package com.google.android.exoplayer2.video.spherical;
|
||||
|
||||
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
|
||||
import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
|
||||
|
||||
import android.opengl.GLES11Ext;
|
||||
@ -90,11 +91,12 @@ import java.nio.FloatBuffer;
|
||||
};
|
||||
|
||||
private int stereoMode;
|
||||
|
||||
@Nullable private GlUtil.Program program;
|
||||
@Nullable private MeshData leftMeshData;
|
||||
@Nullable private MeshData rightMeshData;
|
||||
|
||||
// Program related GL items. These are only valid if program != 0.
|
||||
private int program;
|
||||
private int mvpMatrixHandle;
|
||||
private int uTexMatrixHandle;
|
||||
private int positionHandle;
|
||||
@ -119,12 +121,12 @@ import java.nio.FloatBuffer;
|
||||
|
||||
/** Initializes of the GL components. */
|
||||
/* package */ void init() {
|
||||
program = GlUtil.compileProgram(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE);
|
||||
mvpMatrixHandle = GLES20.glGetUniformLocation(program, "uMvpMatrix");
|
||||
uTexMatrixHandle = GLES20.glGetUniformLocation(program, "uTexMatrix");
|
||||
positionHandle = GLES20.glGetAttribLocation(program, "aPosition");
|
||||
texCoordsHandle = GLES20.glGetAttribLocation(program, "aTexCoords");
|
||||
textureHandle = GLES20.glGetUniformLocation(program, "uTexture");
|
||||
program = new GlUtil.Program(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE);
|
||||
mvpMatrixHandle = program.glGetUniformLocation("uMvpMatrix");
|
||||
uTexMatrixHandle = program.glGetUniformLocation("uTexMatrix");
|
||||
positionHandle = program.glGetAttribLocation("aPosition");
|
||||
texCoordsHandle = program.glGetAttribLocation("aTexCoords");
|
||||
textureHandle = program.glGetUniformLocation("uTexture");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -143,7 +145,7 @@ import java.nio.FloatBuffer;
|
||||
}
|
||||
|
||||
// Configure shader.
|
||||
GLES20.glUseProgram(program);
|
||||
checkNotNull(program).use();
|
||||
checkGlError();
|
||||
|
||||
GLES20.glEnableVertexAttribArray(positionHandle);
|
||||
@ -196,8 +198,9 @@ import java.nio.FloatBuffer;
|
||||
|
||||
/** Cleans up the GL resources. */
|
||||
/* package */ void shutdown() {
|
||||
if (program != 0) {
|
||||
GLES20.glDeleteProgram(program);
|
||||
if (program != null) {
|
||||
program.delete();
|
||||
program = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -186,6 +186,7 @@ import java.nio.ByteBuffer;
|
||||
}
|
||||
eglSurface =
|
||||
GlUtil.getEglSurface(eglDisplay, checkNotNull(checkNotNull(encoder).getInputSurface()));
|
||||
|
||||
GlUtil.focusSurface(
|
||||
eglDisplay,
|
||||
eglContext,
|
||||
@ -193,17 +194,20 @@ import java.nio.ByteBuffer;
|
||||
encoderConfigurationOutputFormat.width,
|
||||
encoderConfigurationOutputFormat.height);
|
||||
decoderTextureId = GlUtil.createExternalTexture();
|
||||
String vertexShaderCode;
|
||||
String fragmentShaderCode;
|
||||
|
||||
GlUtil.Program copyProgram;
|
||||
try {
|
||||
vertexShaderCode = GlUtil.loadAsset(context, "shaders/blit_vertex_shader.glsl");
|
||||
fragmentShaderCode = GlUtil.loadAsset(context, "shaders/copy_external_fragment_shader.glsl");
|
||||
copyProgram =
|
||||
new GlUtil.Program(
|
||||
context,
|
||||
/* vertexShaderFilePath= */ "shaders/blit_vertex_shader.glsl",
|
||||
/* fragmentShaderFilePath= */ "shaders/copy_external_fragment_shader.glsl");
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
int copyProgram = GlUtil.compileProgram(vertexShaderCode, fragmentShaderCode);
|
||||
GLES20.glUseProgram(copyProgram);
|
||||
GlUtil.Attribute[] copyAttributes = GlUtil.getAttributes(copyProgram);
|
||||
|
||||
copyProgram.use();
|
||||
GlUtil.Attribute[] copyAttributes = copyProgram.getAttributes();
|
||||
checkState(copyAttributes.length == 2, "Expected program to have two vertex attributes.");
|
||||
for (GlUtil.Attribute copyAttribute : copyAttributes) {
|
||||
if (copyAttribute.name.equals("a_position")) {
|
||||
@ -229,7 +233,7 @@ import java.nio.ByteBuffer;
|
||||
}
|
||||
copyAttribute.bind();
|
||||
}
|
||||
GlUtil.Uniform[] copyUniforms = GlUtil.getUniforms(copyProgram);
|
||||
GlUtil.Uniform[] copyUniforms = copyProgram.getUniforms();
|
||||
checkState(copyUniforms.length == 2, "Expected program to have two uniforms.");
|
||||
for (GlUtil.Uniform copyUniform : copyUniforms) {
|
||||
if (copyUniform.name.equals("tex_sampler")) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user