Commit f454c9aa by leonwind Committed by Marc Baechinger

Delete glPrograms in Contrast and RgbMatrix.

Remove unecessary null checks.

PiperOrigin-RevId: 469999952
parent 0f48c89f
...@@ -129,7 +129,7 @@ import java.util.Locale; ...@@ -129,7 +129,7 @@ import java.util.Locale;
@Override @Override
public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException { public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
try { try {
checkStateNotNull(glProgram).use(); glProgram.use();
// Draw to the canvas and store it in a texture. // Draw to the canvas and store it in a texture.
String text = String text =
...@@ -159,12 +159,10 @@ import java.util.Locale; ...@@ -159,12 +159,10 @@ import java.util.Locale;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) { try {
try { glProgram.delete();
glProgram.delete(); } catch (GlUtil.GlException e) {
} catch (GlUtil.GlException e) { throw new FrameProcessingException(e);
throw new FrameProcessingException(e);
}
} }
} }
......
...@@ -114,12 +114,10 @@ import java.io.IOException; ...@@ -114,12 +114,10 @@ import java.io.IOException;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) { try {
try { glProgram.delete();
glProgram.delete(); } catch (GlUtil.GlException e) {
} catch (GlUtil.GlException e) { throw new FrameProcessingException(e);
throw new FrameProcessingException(e);
}
} }
} }
} }
...@@ -75,4 +75,14 @@ import java.io.IOException; ...@@ -75,4 +75,14 @@ import java.io.IOException;
throw new FrameProcessingException(e, presentationTimeUs); throw new FrameProcessingException(e, presentationTimeUs);
} }
} }
@Override
public void release() throws FrameProcessingException {
super.release();
try {
glProgram.delete();
} catch (GlUtil.GlException e) {
throw new FrameProcessingException(e);
}
}
} }
...@@ -321,12 +321,10 @@ import java.util.Arrays; ...@@ -321,12 +321,10 @@ import java.util.Arrays;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) { try {
try { glProgram.delete();
glProgram.delete(); } catch (GlUtil.GlException e) {
} catch (GlUtil.GlException e) { throw new FrameProcessingException(e);
throw new FrameProcessingException(e);
}
} }
} }
......
...@@ -135,4 +135,14 @@ import java.io.IOException; ...@@ -135,4 +135,14 @@ import java.io.IOException;
throw new FrameProcessingException(e, presentationTimeUs); throw new FrameProcessingException(e, presentationTimeUs);
} }
} }
@Override
public void release() throws FrameProcessingException {
super.release();
try {
glProgram.delete();
} catch (GlUtil.GlException e) {
throw new FrameProcessingException(e);
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment