Revision 8c57d77b
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/library/program/DistortedProgram.java | ||
|---|---|---|
| 22 | 22 |
|
| 23 | 23 |
import android.opengl.GLES30; |
| 24 | 24 |
|
| 25 |
import org.distorted.library.main.DistortedLibrary; |
|
| 26 |
|
|
| 25 | 27 |
import java.io.BufferedReader; |
| 26 | 28 |
import java.io.IOException; |
| 27 | 29 |
import java.io.InputStream; |
| ... | ... | |
| 91 | 93 |
final int[] numberOfUniforms = new int[1]; |
| 92 | 94 |
GLES30.glGetProgramiv(programHandle, GLES30.GL_ACTIVE_UNIFORMS, numberOfUniforms, 0); |
| 93 | 95 |
|
| 94 |
//android.util.Log.d("program", "number of active uniforms="+numberOfUniforms[0]);
|
|
| 96 |
//DistortedLibrary.logMessage("DistortedProgram: number of active uniforms="+numberOfUniforms[0]);
|
|
| 95 | 97 |
} |
| 96 | 98 |
|
| 97 | 99 |
return programHandle; |
| ... | ... | |
| 137 | 139 |
|
| 138 | 140 |
if( subline.startsWith(mUniformStr)) |
| 139 | 141 |
{
|
| 140 |
//android.util.Log.e("program", "GOOD LINE: " +subline+" subLen="+subLen);
|
|
| 142 |
//DistortedLibrary.logMessage("DistortedProgram: GOOD LINE: " +subline+" subLen="+subLen);
|
|
| 141 | 143 |
|
| 142 | 144 |
for(nameBegin=subLen-1; nameBegin>mUniformLen-2; nameBegin--) |
| 143 | 145 |
{
|
| ... | ... | |
| 259 | 261 |
|
| 260 | 262 |
if( attribute!=null ) |
| 261 | 263 |
{
|
| 262 |
//android.util.Log.d("program", "new attribute: "+attribute);
|
|
| 264 |
//DistortedLibrary.logMessage("DistortedProgram: new attribute: "+attribute);
|
|
| 263 | 265 |
if( attrList.length()>0 ) attrList+=" "; |
| 264 | 266 |
attrList += attribute; |
| 265 | 267 |
} |
| ... | ... | |
| 330 | 332 |
} |
| 331 | 333 |
else |
| 332 | 334 |
{
|
| 333 |
android.util.Log.e("Program", "Error: marker string not found in SHADER!");
|
|
| 335 |
DistortedLibrary.logMessage("DistortedProgram: Error: marker string not found in SHADER!");
|
|
| 334 | 336 |
} |
| 335 | 337 |
|
| 336 | 338 |
return null; |
Also available in: Unified diff
Decouple (to a large degree) the OpenGL Library from Android.