Revision 194ab46f
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueFragment.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.library; |
| 21 | 21 |
|
| 22 |
import android.opengl.GLES20;
|
|
| 22 |
import android.opengl.GLES30;
|
|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.message.EffectMessage; |
| 25 | 25 |
import org.distorted.library.type.Data1D; |
| ... | ... | |
| 54 | 54 |
|
| 55 | 55 |
static void getUniforms(int mProgramH) |
| 56 | 56 |
{
|
| 57 |
mNumEffectsH= GLES20.glGetUniformLocation( mProgramH, "fNumEffects");
|
|
| 58 |
mTypeH = GLES20.glGetUniformLocation( mProgramH, "fType");
|
|
| 59 |
mUniformsH = GLES20.glGetUniformLocation( mProgramH, "fUniforms");
|
|
| 57 |
mNumEffectsH= GLES30.glGetUniformLocation( mProgramH, "fNumEffects");
|
|
| 58 |
mTypeH = GLES30.glGetUniformLocation( mProgramH, "fType");
|
|
| 59 |
mUniformsH = GLES30.glGetUniformLocation( mProgramH, "fUniforms");
|
|
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 | 62 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 115 | 115 |
|
| 116 | 116 |
synchronized void send(float halfX, float halfY) |
| 117 | 117 |
{
|
| 118 |
GLES20.glUniform1i( mNumEffectsH, mNumEffects);
|
|
| 118 |
GLES30.glUniform1i( mNumEffectsH, mNumEffects);
|
|
| 119 | 119 |
|
| 120 | 120 |
if( mNumEffects>0 ) |
| 121 | 121 |
{
|
| ... | ... | |
| 127 | 127 |
mUniforms[NUM_UNIFORMS*i+7] = mCache[NUM_CACHE*i+3]; |
| 128 | 128 |
} |
| 129 | 129 |
|
| 130 |
GLES20.glUniform1iv( mTypeH , mNumEffects, mName ,0);
|
|
| 131 |
GLES20.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
|
|
| 130 |
GLES30.glUniform1iv( mTypeH , mNumEffects, mName ,0);
|
|
| 131 |
GLES30.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
|
|
| 132 | 132 |
} |
| 133 | 133 |
} |
| 134 | 134 |
|
| ... | ... | |
| 136 | 136 |
|
| 137 | 137 |
synchronized static void sendZero() |
| 138 | 138 |
{
|
| 139 |
GLES20.glUniform1i( mNumEffectsH, 0);
|
|
| 139 |
GLES30.glUniform1i( mNumEffectsH, 0);
|
|
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Try using OpenGL ES 3.0 everywhere (but if device does not support it, try creating 2.0 context - this is important because of the emulator!)