sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GL: Use only the index location returned by glGetAttribLocation

Browse source 
location and index are mostly equivalent, except that it's possible that location is more up-to-date than index, so we can just always use location.

PiperOrigin-RevId: 570950407
This commit is contained in:
huangdarwin 2023-10-05 02:33:22 -07:00 committed by Copybara-Service
parent 42c1846984
commit 40b990f5fa
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
View file

@ -231,41 +231,43 @@ public final class GlProgram {
/* 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[] attributeNameMaxLength = new int[1];
GLES20.glGetProgramiv( GLES20.glGetProgramiv(
programId, GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, length, /* offset= */ 0); programId,
byte[] nameBytes = new byte[length[0]]; GLES20.GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
attributeNameMaxLength,
/* offset= */ 0);
byte[] nameBytes = new byte[attributeNameMaxLength[0]];
GLES20.glGetActiveAttrib( GLES20.glGetActiveAttrib(
programId, programId,
index, index,
length[0], /* bufsize= */ attributeNameMaxLength[0],
/* unusedLength */ new int[1], /* unusedLength */ new int[1],
/* lengthOffset= */ 0, /* lengthOffset= */ 0,
/* unusedSize */ new int[1], /* unusedSize */ new int[1],
/* sizeOffset= */ 0, /* sizeOffset= */ 0,
/* unusedType */ new int[1], /* unusedType */ new int[1],
/* typeOffset= */ 0, /* typeOffset= */ 0,
nameBytes, /* name= */ nameBytes,
/* nameOffset= */ 0); /* nameOffset= */ 0);
String name = new String(nameBytes, /* offset= */ 0, getCStringLength(nameBytes)); String name = new String(nameBytes, /* offset= */ 0, getCStringLength(nameBytes));
int location = getAttributeLocation(programId, name); int location = getAttributeLocation(programId, name);
return new Attribute(name, index, location); return new Attribute(name, location);
} }
/** The name of the attribute in the GLSL sources. */ /** The name of the attribute in the GLSL sources. */
public final String name; public final String name;
private final int index; /** The index or location of the attribute, from glGetAttribLocation. */
private final int location; private final int location;
@Nullable private Buffer buffer; @Nullable private Buffer buffer;
private int size; private int size;
private Attribute(String name, int index, int location) { private Attribute(String name, int location) {
this.name = name; this.name = name;
this.index = index;
this.location = location; this.location = location;
} }
@ -291,7 +293,7 @@ public final class GlProgram {
GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, /* buffer= */ 0); GLES20.glBindBuffer(GLES20.GL_ARRAY_BUFFER, /* buffer= */ 0);
GLES20.glVertexAttribPointer( GLES20.glVertexAttribPointer(
location, size, GLES20.GL_FLOAT, /* normalized= */ false, /* stride= */ 0, buffer); location, size, GLES20.GL_FLOAT, /* normalized= */ false, /* stride= */ 0, buffer);
GLES20.glEnableVertexAttribArray(index); GLES20.glEnableVertexAttribArray(location);
GlUtil.checkGlError(); GlUtil.checkGlError();
} }
} }