Project

General

Profile

« Previous | Next » 

Revision e6519ac8

Added by Leszek Koltunski about 6 years ago

Up library requirements to OpenGL ES 3.1 (needed for the upcoming GL_SHADER_STORAGE_BUFFER)

View differences:

src/main/java/org/distorted/library/main/EffectQueueVertex.java
19 19

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

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

  
24 24
import org.distorted.library.effect.EffectType;
25 25
import org.distorted.library.effect.VertexEffect;
......
46 46

  
47 47
  static void getUniforms(int mProgramH)
48 48
    {
49
    mNumEffectsH= GLES30.glGetUniformLocation( mProgramH, "vNumEffects");
50
    mNameH      = GLES30.glGetUniformLocation( mProgramH, "vName");
51
    mUniformsH  = GLES30.glGetUniformLocation( mProgramH, "vUniforms");
49
    mNumEffectsH= GLES31.glGetUniformLocation( mProgramH, "vNumEffects");
50
    mNameH      = GLES31.glGetUniformLocation( mProgramH, "vName");
51
    mUniformsH  = GLES31.glGetUniformLocation( mProgramH, "vUniforms");
52 52
    }
53 53

  
54 54
///////////////////////////////////////////////////////////////////////////////////////////////////
......
88 88

  
89 89
  void send()
90 90
    {
91
    GLES30.glUniform1i( mNumEffectsH, mNumEffects);
91
    GLES31.glUniform1i( mNumEffectsH, mNumEffects);
92 92
      
93 93
    if( mNumEffects>0 )
94 94
      {
95
      GLES30.glUniform1iv( mNameH    ,                 mNumEffects, mName    ,0);
96
      GLES30.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
95
      GLES31.glUniform1iv( mNameH    ,                 mNumEffects, mName    ,0);
96
      GLES31.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
97 97
      }
98 98
    }
99 99
  }

Also available in: Unified diff