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/MeshObject.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 java.nio.FloatBuffer;
25 25

  
......
77 77
     {
78 78
     if( mAttVBO[0]<0 )
79 79
       {
80
       GLES30.glGenBuffers(1, mAttVBO, 0);
81
       GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mAttVBO[0]);
82
       GLES30.glBufferData(GLES30.GL_ARRAY_BUFFER, numVertices*VERTSIZE, mVertAttribs, GLES30.GL_STATIC_READ);
83
       GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, 0);
80
       GLES31.glGenBuffers(1, mAttVBO, 0);
81
       GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mAttVBO[0]);
82
       GLES31.glBufferData(GLES31.GL_ARRAY_BUFFER, numVertices*VERTSIZE, mVertAttribs, GLES31.GL_STATIC_READ);
83
       GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
84 84
       }
85 85
     if( mAttTFO[0]<0 && Distorted.GLSL >= 300 )
86 86
       {
87
       GLES30.glGenBuffers(1, mAttTFO, 0);
88
       GLES30.glBindBuffer(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, mAttTFO[0]);
89
       GLES30.glBufferData(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, numVertices*TFSIZE, null, GLES30.GL_STATIC_READ);
90
       GLES30.glBindBuffer(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 0);
87
       GLES31.glGenBuffers(1, mAttTFO, 0);
88
       GLES31.glBindBuffer(GLES31.GL_TRANSFORM_FEEDBACK_BUFFER, mAttTFO[0]);
89
       GLES31.glBufferData(GLES31.GL_TRANSFORM_FEEDBACK_BUFFER, numVertices*TFSIZE, null, GLES31.GL_STATIC_READ);
90
       GLES31.glBindBuffer(GLES31.GL_TRANSFORM_FEEDBACK_BUFFER, 0);
91 91
       }
92 92
     }
93 93

  
......
98 98
     {
99 99
     if( mAttVBO[0]>=0 )
100 100
       {
101
       GLES30.glDeleteBuffers(1, mAttVBO, 0);
101
       GLES31.glDeleteBuffers(1, mAttVBO, 0);
102 102
       mAttVBO[0] = -1;
103 103
       }
104 104
     if( mAttTFO[0]>=0 )
105 105
       {
106
       GLES30.glDeleteBuffers(1, mAttTFO, 0);
106
       GLES31.glDeleteBuffers(1, mAttTFO, 0);
107 107
       mAttTFO[0] = -1;
108 108
       }
109 109
     }

Also available in: Unified diff