v0.92b, removed glew

milgra · Mar 8, 2023 · 750e3e6 · 750e3e6
1 parent c869b43
commit 750e3e6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'sov',
   'c',
-  version: '0.91b',
+  version: '0.92b',
   license: 'MIT',
   default_options: ['c_std=gnu99',
   		    'warning_level=3']
@@ -11,7 +11,6 @@ cc = meson.get_compiler('c')
 
 egl = dependency('egl')
 png = dependency('libpng')
-glew = dependency('glew')
 math = cc.find_library('m')
 wegl = dependency('wayland-egl')
 glesv2 = dependency('glesv2')
@@ -61,7 +60,6 @@ sov_dependencies = [wayland_client,
 		    freetype,
 		    math,
 		    glesv2,
-		    glew,
 		    xkbcommon,
 		    egl,
 		    wegl]

diff --git a/src/kinetic_ui/egl/ku_gl.c b/src/kinetic_ui/egl/ku_gl.c
@@ -3,7 +3,6 @@
 
 #include "ku_bitmap.c"
 #include "mt_vector.c"
-/* #include <GL/glew.h> */
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@ void ku_gl_save_framebuffer(ku_bitmap_t* bitmap);
 typedef struct _glbuf_t
 {
     GLuint vbo;
-    GLuint vao;
 } glbuf_t;
 
 typedef struct _gltex_t
@@ -102,13 +100,6 @@ glbuf_t ku_gl_create_vertex_buffer()
 
     glGenBuffers(1, &vb.vbo); // DEL 0
     glBindBuffer(GL_ARRAY_BUFFER, vb.vbo);
-    glGenVertexArrays(1, &vb.vao); // DEL 1
-    glBindVertexArray(vb.vao);
-    glEnableVertexAttribArray(0);
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 24, 0);
-    glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 24, (const GLvoid*) 8);
-    glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
     return vb;
@@ -119,7 +110,6 @@ glbuf_t ku_gl_create_vertex_buffer()
 void ku_gl_delete_vertex_buffer(glbuf_t buf)
 {
     glDeleteBuffers(1, &buf.vbo);
-    glDeleteVertexArrays(1, &buf.vao);
 }
 
 /* create texture */
@@ -168,10 +158,6 @@ void ku_gl_delete_texture(gltex_t tex)
 
 void ku_gl_init(int max_dev_width, int max_dev_height)
 {
-    GLenum err = glewInit();
-    if (GLEW_OK != err)
-	mt_log_debug("GLEW Init error %s\n", glewGetErrorString(err));
-
     kugl.shader = ku_gl_create_texture_shader();
     kugl.buffer = ku_gl_create_vertex_buffer();
 
@@ -431,7 +417,10 @@ void ku_gl_add_vertexes(mt_vector_t* views)
 void ku_gl_render(ku_bitmap_t* bitmap)
 {
     /* glBindFramebuffer(GL_FRAMEBUFFER, tex_frame.fb); */
-    glBindVertexArray(kugl.buffer.vao);
+    glEnableVertexAttribArray(0);
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 24, 0);
+    glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 24, (const GLvoid*) 8);
 
     glActiveTexture(GL_TEXTURE0 + kugl.texture.index);
     glBindTexture(GL_TEXTURE_2D, kugl.texture.tx);
@@ -448,15 +437,17 @@ void ku_gl_render(ku_bitmap_t* bitmap)
     glViewport(0, 0, bitmap->w, bitmap->h);
 
     glDrawArrays(GL_TRIANGLES, 0, kugl.floatbuffer->pos);
-    glBindVertexArray(0);
 }
 
 /* render one quad */
 
 void ku_gl_render_quad(ku_bitmap_t* bitmap, uint32_t index, bmr_t mask)
 {
     /* glBindFramebuffer(GL_FRAMEBUFFER, tex_frame.fb); */
-    glBindVertexArray(kugl.buffer.vao);
+    glEnableVertexAttribArray(0);
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 24, 0);
+    glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 24, (const GLvoid*) 8);
 
     glActiveTexture(GL_TEXTURE0 + kugl.texture.index);
     glBindTexture(GL_TEXTURE_2D, kugl.texture.tx);
@@ -476,7 +467,6 @@ void ku_gl_render_quad(ku_bitmap_t* bitmap, uint32_t index, bmr_t mask)
 
     glDrawArrays(GL_TRIANGLES, index * 6, 6);
 
-    glBindVertexArray(0);
     glBindTexture(GL_TEXTURE_2D, 0);
 }
 

diff --git a/src/kinetic_ui/egl/ku_gl_floatbuffer.c b/src/kinetic_ui/egl/ku_gl_floatbuffer.c
@@ -2,7 +2,7 @@
 #define ku_floatbuffer_h
 
 #include "mt_memory.c"
-#include <GL/glew.h>
+#include <GLES2/gl2.h>
 #include <string.h>
 
 typedef struct ku_floatbuffer_t ku_floatbuffer_t;

diff --git a/src/kinetic_ui/egl/ku_gl_shader.c b/src/kinetic_ui/egl/ku_gl_shader.c
@@ -1,7 +1,7 @@
 #ifndef ku_gl_shader_h
 #define ku_gl_shader_h
 
-#include <GL/glew.h>
+#include <GLES2/gl2.h>
 
 typedef struct _glsha_t
 {