loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GL: Document ambiguous parameter names in comments.

Browse Source 
Also, made a few other refactoring changes for clarity. No functional
changes intended.

PiperOrigin-RevId: 414487729
This commit is contained in:
huangdarwin 2021-12-06 18:51:10 +00:00 committed by Ian Baker
parent 94caa8ad6c
commit 07fdf0e794
1 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java
View File

@ -105,7 +105,7 @@ public final class GlUtil {
// Link and use the program, and enumerate attributes/uniforms. // Link and use the program, and enumerate attributes/uniforms.
GLES20.glLinkProgram(programId); GLES20.glLinkProgram(programId);
int[] linkStatus = new int[] {GLES20.GL_FALSE}; int[] linkStatus = new int[] {GLES20.GL_FALSE};
GLES20.glGetProgramiv(programId, GLES20.GL_LINK_STATUS, linkStatus, 0); GLES20.glGetProgramiv(programId, GLES20.GL_LINK_STATUS, linkStatus, /* offset= */ 0);
if (linkStatus[0] != GLES20.GL_TRUE) { if (linkStatus[0] != GLES20.GL_TRUE) {
throwGlException( throwGlException(
"Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(programId)); "Unable to link shader program: \n" + GLES20.glGetProgramInfoLog(programId));
@ -113,7 +113,8 @@ public final class GlUtil {
GLES20.glUseProgram(programId); GLES20.glUseProgram(programId);
attributeByName = new HashMap<>(); attributeByName = new HashMap<>();
int[] attributeCount = new int[1]; int[] attributeCount = new int[1];
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_ATTRIBUTES, attributeCount, 0); GLES20.glGetProgramiv(
programId, GLES20.GL_ACTIVE_ATTRIBUTES, attributeCount, /* offset= */ 0);
attributes = new Attribute[attributeCount[0]]; attributes = new Attribute[attributeCount[0]];
for (int i = 0; i < attributeCount[0]; i++) { for (int i = 0; i < attributeCount[0]; i++) {
Attribute attribute = Attribute.create(programId, i); Attribute attribute = Attribute.create(programId, i);
@ -122,7 +123,7 @@ public final class GlUtil {
} }
uniformByName = new HashMap<>(); uniformByName = new HashMap<>();
int[] uniformCount = new int[1]; int[] uniformCount = new int[1];
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_UNIFORMS, uniformCount, 0); GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_UNIFORMS, uniformCount, /* offset= */ 0);
uniforms = new Uniform[uniformCount[0]]; uniforms = new Uniform[uniformCount[0]];
for (int i = 0; i < uniformCount[0]; i++) { for (int i = 0; i < uniformCount[0]; i++) {
Uniform uniform = Uniform.create(programId, i); Uniform uniform = Uniform.create(programId, i);
@ -290,11 +291,11 @@ public final class GlUtil {
int lastError = GLES20.GL_NO_ERROR; int lastError = GLES20.GL_NO_ERROR;
int error; int error;
while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) { while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
Log.e(TAG, "glError " + gluErrorString(error)); Log.e(TAG, "glError: " + gluErrorString(error));
lastError = error; lastError = error;
} }
if (lastError != GLES20.GL_NO_ERROR) { if (lastError != GLES20.GL_NO_ERROR) {
throwGlException("glError " + gluErrorString(lastError)); throwGlException("glError: " + gluErrorString(lastError));
} }
} }
@ -315,7 +316,7 @@ public final class GlUtil {
*/ */
public static void deleteTexture(int textureId) { public static void deleteTexture(int textureId) {
int[] textures = new int[] {textureId}; int[] textures = new int[] {textureId};
GLES20.glDeleteTextures(1, textures, 0); GLES20.glDeleteTextures(/* n= */ 1, textures, /* offset= */ 0);
checkGlError(); checkGlError();
} }
@ -372,7 +373,7 @@ public final class GlUtil {
*/ */
public static int createExternalTexture() { public static int createExternalTexture() {
int[] texId = new int[1]; int[] texId = new int[1];
GLES20.glGenTextures(1, IntBuffer.wrap(texId)); GLES20.glGenTextures(/* n= */ 1, IntBuffer.wrap(texId));
GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, texId[0]); GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, texId[0]);
GLES20.glTexParameteri( GLES20.glTexParameteri(
GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR); GLES11Ext.GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
@ -392,7 +393,7 @@ public final class GlUtil {
GLES20.glCompileShader(shader); GLES20.glCompileShader(shader);
int[] result = new int[] {GLES20.GL_FALSE}; int[] result = new int[] {GLES20.GL_FALSE};
GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, 0); GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, result, /* offset= */ 0);
if (result[0] != GLES20.GL_TRUE) { if (result[0] != GLES20.GL_TRUE) {
throwGlException(GLES20.glGetShaderInfoLog(shader) + ", source: " + glsl); throwGlException(GLES20.glGetShaderInfoLog(shader) + ", source: " + glsl);
} }
@ -441,7 +442,8 @@ public final class GlUtil {
/* Returns the attribute at the given index in the program. */ /* Returns the attribute at the given index in the program. */
public static Attribute create(int programId, int index) { public static Attribute create(int programId, int index) {
int[] length = new int[1]; int[] length = new int[1];
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, length, 0); GLES20.glGetProgramiv(
programId, GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, length, /* offset= */ 0);
int[] type = new int[1]; int[] type = new int[1];
int[] size = new int[1]; int[] size = new int[1];
@ -449,8 +451,18 @@ public final class GlUtil {
int[] ignore = new int[1]; int[] ignore = new int[1];
GLES20.glGetActiveAttrib( GLES20.glGetActiveAttrib(
programId, index, length[0], ignore, 0, size, 0, type, 0, nameBytes, 0); programId,
String name = new String(nameBytes, 0, strlen(nameBytes)); index,
length[0],
ignore,
/* lengthOffset= */ 0,
size,
/* sizeOffset= */ 0,
type,
/* typeOffset= */ 0,
nameBytes,
/* nameOffset= */ 0);
String name = new String(nameBytes, /* offset= */ 0, strlen(nameBytes));
int location = getAttributeLocation(programId, name); int location = getAttributeLocation(programId, name);
return new Attribute(name, index, location); return new Attribute(name, index, location);
@ -490,14 +502,9 @@ public final class GlUtil {
*/ */
public void bind() { public void bind() {
Buffer buffer = checkNotNull(this.buffer, "call setBuffer before bind"); Buffer buffer = checkNotNull(this.buffer, "call setBuffer before bind");
GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, 0); GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, /* buffer= */ 0);
GLES20.glVertexAttribPointer( GLES20.glVertexAttribPointer(
location, location, size, GLES20.GL_FLOAT, /* normalized= */ false, /* stride= */ 0, buffer);
size, // count
GLES20.GL_FLOAT, // type
false, // normalize
0, // stride
buffer);
GLES20.glEnableVertexAttribArray(index); GLES20.glEnableVertexAttribArray(index);
checkGlError(); checkGlError();
} }
@ -511,7 +518,8 @@ public final class GlUtil {
/** Returns the uniform at the given index in the program. */ /** Returns the uniform at the given index in the program. */
public static Uniform create(int programId, int index) { public static Uniform create(int programId, int index) {
int[] length = new int[1]; int[] length = new int[1];
GLES20.glGetProgramiv(programId, GLES20.GL_ACTIVE_UNIFORM_MAX_LENGTH, length, 0); GLES20.glGetProgramiv(
programId, GLES20.GL_ACTIVE_UNIFORM_MAX_LENGTH, length, /* offset= */ 0);
int[] type = new int[1]; int[] type = new int[1];
int[] size = new int[1]; int[] size = new int[1];
@ -519,8 +527,18 @@ public final class GlUtil {
int[] ignore = new int[1]; int[] ignore = new int[1];
GLES20.glGetActiveUniform( GLES20.glGetActiveUniform(
programId, index, length[0], ignore, 0, size, 0, type, 0, nameBytes, 0); programId,
String name = new String(nameBytes, 0, strlen(nameBytes)); index,
length[0],
ignore,
/* lengthOffset= */ 0,
size,
/*sizeOffset= */ 0,
type,
/* typeOffset= */ 0,
nameBytes,
/* nameOffset= */ 0);
String name = new String(nameBytes, /* offset= */ 0, strlen(nameBytes));
int location = getUniformLocation(programId, name); int location = getUniformLocation(programId, name);
return new Uniform(name, location, type[0]); return new Uniform(name, location, type[0]);
@ -561,7 +579,7 @@ public final class GlUtil {
/** Configures {@link #bind()} to use the specified float[] {@code value} for this uniform. */ /** Configures {@link #bind()} to use the specified float[] {@code value} for this uniform. */
public void setFloats(float[] value) { public void setFloats(float[] value) {
System.arraycopy(value, 0, this.value, 0, value.length); System.arraycopy(value, /* srcPos= */ 0, this.value, /* destPos= */ 0, value.length);
} }
/** /**
@ -572,19 +590,20 @@ public final class GlUtil {
*/ */
public void bind() { public void bind() {
if (type == GLES20.GL_FLOAT) { if (type == GLES20.GL_FLOAT) {
GLES20.glUniform1fv(location, 1, value, 0); GLES20.glUniform1fv(location, /* count= */ 1, value, /* offset= */ 0);
checkGlError(); checkGlError();
return; return;
} }
if (type == GLES20.GL_FLOAT_MAT4) { if (type == GLES20.GL_FLOAT_MAT4) {
GLES20.glUniformMatrix4fv(location, 1, false, value, 0); GLES20.glUniformMatrix4fv(
location, /* count= */ 1, /* transpose= */ false, value, /* offset= */ 0);
checkGlError(); checkGlError();
return; return;
} }
if (texId == 0) { if (texId == 0) {
throw new IllegalStateException("Call setSamplerTexId before bind."); throw new IllegalStateException("No call to setSamplerTexId() before bind.");
} }
GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + unit); GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + unit);
if (type == GLES11Ext.GL_SAMPLER_EXTERNAL_OES) { if (type == GLES11Ext.GL_SAMPLER_EXTERNAL_OES) {
@ -615,7 +634,8 @@ public final class GlUtil {
checkEglException(!eglDisplay.equals(EGL14.EGL_NO_DISPLAY), "No EGL display."); checkEglException(!eglDisplay.equals(EGL14.EGL_NO_DISPLAY), "No EGL display.");
int[] major = new int[1]; int[] major = new int[1];
int[] minor = new int[1]; int[] minor = new int[1];
if (!EGL14.eglInitialize(eglDisplay, major, 0, minor, 0)) { if (!EGL14.eglInitialize(
eglDisplay, major, /* majorOffset= */ 0, minor, /* minorOffset= */ 0)) {
throwGlException("Error in eglInitialize."); throwGlException("Error in eglInitialize.");
} }
checkGlError(); checkGlError();
@ -628,7 +648,11 @@ public final class GlUtil {
int[] contextAttributes = {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE}; int[] contextAttributes = {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE};
EGLContext eglContext = EGLContext eglContext =
EGL14.eglCreateContext( EGL14.eglCreateContext(
eglDisplay, getEglConfig(eglDisplay), EGL14.EGL_NO_CONTEXT, contextAttributes, 0); eglDisplay,
getEglConfig(eglDisplay),
EGL14.EGL_NO_CONTEXT,
contextAttributes,
/* offset= */ 0);
if (eglContext == null) { if (eglContext == null) {
EGL14.eglTerminate(eglDisplay); EGL14.eglTerminate(eglDisplay);
throw new UnsupportedEglVersionException(); throw new UnsupportedEglVersionException();
@ -640,20 +664,24 @@ public final class GlUtil {
@DoNotInline @DoNotInline
public static EGLSurface getEglSurface(EGLDisplay eglDisplay, Object surface) { public static EGLSurface getEglSurface(EGLDisplay eglDisplay, Object surface) {
return EGL14.eglCreateWindowSurface( return EGL14.eglCreateWindowSurface(
eglDisplay, getEglConfig(eglDisplay), surface, new int[] {EGL14.EGL_NONE}, 0); eglDisplay,
getEglConfig(eglDisplay),
surface,
new int[] {EGL14.EGL_NONE},
/* offset= */ 0);
} }
@DoNotInline @DoNotInline
public static void focusSurface( public static void focusSurface(
EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface surface, int width, int height) { EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface surface, int width, int height) {
int[] fbos = new int[1]; int[] fbos = new int[1];
GLES20.glGetIntegerv(GLES20.GL_FRAMEBUFFER_BINDING, fbos, 0); GLES20.glGetIntegerv(GLES20.GL_FRAMEBUFFER_BINDING, fbos, /* offset= */ 0);
int noFbo = 0; int noFbo = 0;
if (fbos[0] != noFbo) { if (fbos[0] != noFbo) {
GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, noFbo); GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, noFbo);
} }
EGL14.eglMakeCurrent(eglDisplay, surface, surface, eglContext); EGL14.eglMakeCurrent(eglDisplay, surface, surface, eglContext);
GLES20.glViewport(0, 0, width, height); GLES20.glViewport(/* x= */ 0, /* y= */ 0, width, height);
} }
@DoNotInline @DoNotInline
@ -701,7 +729,14 @@ public final class GlUtil {
int[] configsCount = new int[1]; int[] configsCount = new int[1];
EGLConfig[] eglConfigs = new EGLConfig[1]; EGLConfig[] eglConfigs = new EGLConfig[1];
if (!EGL14.eglChooseConfig( if (!EGL14.eglChooseConfig(
eglDisplay, defaultConfiguration, 0, eglConfigs, 0, 1, configsCount, 0)) { eglDisplay,
defaultConfiguration,
/* attrib_listOffset= */ 0,
eglConfigs,
/* configsOffset= */ 0,
/* config_size= */ 1,
configsCount,
/* num_configOffset= */ 0)) {
throwGlException("eglChooseConfig failed."); throwGlException("eglChooseConfig failed.");
} }
return eglConfigs[0]; return eglConfigs[0];