Project

General

Profile

« Previous | Next » 

Revision b7074bc6

Added by Leszek Koltunski about 4 years ago

Lower requirements - now only OpenGL ES 3.0 is required; if running on such platform, OIT part of the API ( which is the only one which actually requires 3.1) is switched off.

View differences:

src/main/java/org/distorted/library/effectqueue/EffectQueueFragment.java
19 19

  
20 20
package org.distorted.library.effectqueue;
21 21

  
22
import android.opengl.GLES31;
22
import android.opengl.GLES30;
23 23

  
24 24
import org.distorted.library.effect.EffectType;
25 25
import org.distorted.library.effect.FragmentEffect;
......
47 47

  
48 48
  static void uniforms(int mProgramH, int variant)
49 49
    {
50
    mNumEffectsH[variant]= GLES31.glGetUniformLocation( mProgramH, "fNumEffects");
51
    mNameH[variant]      = GLES31.glGetUniformLocation( mProgramH, "fName");
52
    mUniformsH[variant]  = GLES31.glGetUniformLocation( mProgramH, "fUniforms");
50
    mNumEffectsH[variant]= GLES30.glGetUniformLocation( mProgramH, "fNumEffects");
51
    mNameH[variant]      = GLES30.glGetUniformLocation( mProgramH, "fName");
52
    mUniformsH[variant]  = GLES30.glGetUniformLocation( mProgramH, "fUniforms");
53 53
    }
54 54

  
55 55
///////////////////////////////////////////////////////////////////////////////////////////////////
......
77 77
  
78 78
  void send(int variant)
79 79
    {
80
    GLES31.glUniform1i( mNumEffectsH[variant], mNumEffects);
80
    GLES30.glUniform1i( mNumEffectsH[variant], mNumEffects);
81 81

  
82 82
    if( mNumEffects>0 )
83 83
      {
84
      GLES31.glUniform1iv( mNameH[variant]    ,                 mNumEffects, mName    ,0);
85
      GLES31.glUniform4fv( mUniformsH[variant],(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
84
      GLES30.glUniform1iv( mNameH[variant]    ,                 mNumEffects, mName    ,0);
85
      GLES30.glUniform4fv( mUniformsH[variant],(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
86 86
      }  
87 87
    }
88 88
  }

Also available in: Unified diff