Revision 194ab46f
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueVertex.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; |
| ... | ... | |
| 60 | 60 |
|
| 61 | 61 |
static void getUniforms(int mProgramH) |
| 62 | 62 |
{
|
| 63 |
mNumEffectsH= GLES20.glGetUniformLocation( mProgramH, "vNumEffects");
|
|
| 64 |
mTypeH = GLES20.glGetUniformLocation( mProgramH, "vType");
|
|
| 65 |
mUniformsH = GLES20.glGetUniformLocation( mProgramH, "vUniforms");
|
|
| 63 |
mNumEffectsH= GLES30.glGetUniformLocation( mProgramH, "vNumEffects");
|
|
| 64 |
mTypeH = GLES30.glGetUniformLocation( mProgramH, "vType");
|
|
| 65 |
mUniformsH = GLES30.glGetUniformLocation( mProgramH, "vUniforms");
|
|
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 | 68 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 135 | 135 |
|
| 136 | 136 |
synchronized void send(float halfX, float halfY, float halfZ) |
| 137 | 137 |
{
|
| 138 |
GLES20.glUniform1i( mNumEffectsH, mNumEffects);
|
|
| 138 |
GLES30.glUniform1i( mNumEffectsH, mNumEffects);
|
|
| 139 | 139 |
|
| 140 | 140 |
if( mNumEffects>0 ) |
| 141 | 141 |
{
|
| ... | ... | |
| 146 | 146 |
mUniforms[NUM_UNIFORMS*i+7] = mCache[NUM_CACHE*i+2]-halfZ; |
| 147 | 147 |
} |
| 148 | 148 |
|
| 149 |
GLES20.glUniform1iv( mTypeH , mNumEffects, mName ,0);
|
|
| 150 |
GLES20.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
|
|
| 149 |
GLES30.glUniform1iv( mTypeH , mNumEffects, mName ,0);
|
|
| 150 |
GLES30.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
|
|
| 151 | 151 |
} |
| 152 | 152 |
} |
| 153 | 153 |
|
| ... | ... | |
| 155 | 155 |
|
| 156 | 156 |
synchronized static void sendZero() |
| 157 | 157 |
{
|
| 158 |
GLES20.glUniform1i( mNumEffectsH, 0);
|
|
| 158 |
GLES30.glUniform1i( mNumEffectsH, 0);
|
|
| 159 | 159 |
} |
| 160 | 160 |
|
| 161 | 161 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
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!)