Display and control your Android device
Extract mipmaps initialization and generation
Romain Vimont4e1f0ddb0dcc
diff --git a/app/src/opengl.c b/app/src/opengl.cindex 91e8d01d..2a94811b 100644--- a/app/src/opengl.c+++ b/app/src/opengl.c@@ -63,3 +63,31 @@ sc_opengl_version_at_least(struct sc_opengl *gl,|| (gl->version_major == minver_major&& gl->version_minor >= minver_minor);}++void+sc_opengl_enable_mipmaps(struct sc_opengl *gl, uint32_t *tex_ids, size_t n) {+ for (size_t i = 0; i < n; ++i) {+ assert(tex_ids[i]);+ gl->BindTexture(GL_TEXTURE_2D, tex_ids[i]);++ gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,+ GL_LINEAR_MIPMAP_LINEAR);+ if (!gl->is_opengles) {+ // GL_TEXTURE_LOD_BIAS is not available in OpenGL ES+ gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -1.f);+ }+ }++ gl->BindTexture(GL_TEXTURE_2D, 0);+}++void+sc_opengl_generate_mipmaps(struct sc_opengl *gl, uint32_t *tex_ids, size_t n) {+ for (size_t i = 0; i < n; ++i) {+ assert(tex_ids[i]);+ gl->BindTexture(GL_TEXTURE_2D, tex_ids[i]);+ gl->GenerateMipmap(GL_TEXTURE_2D);+ }++ gl->BindTexture(GL_TEXTURE_2D, 0);+}diff --git a/app/src/opengl.h b/app/src/opengl.hindex 8db4e5d4..b48636dd 100644--- a/app/src/opengl.h+++ b/app/src/opengl.h@@ -36,4 +36,10 @@ sc_opengl_version_at_least(struct sc_opengl *gl,int minver_major, int minver_minor,int minver_es_major, int minver_es_minor);+void+sc_opengl_enable_mipmaps(struct sc_opengl *gl, uint32_t *tex_ids, size_t n);++void+sc_opengl_generate_mipmaps(struct sc_opengl *gl, uint32_t *tex_ids, size_t n);+#endifdiff --git a/app/src/texture.c b/app/src/texture.cindex d4c1370b..7a93e87f 100644--- a/app/src/texture.c+++ b/app/src/texture.c@@ -159,15 +159,9 @@ sc_texture_create_frame_texture(struct sc_texture *tex,assert(!(texture_id & ~0xFFFFFFFF)); // fits in uint32_ttex->texture_ids[i] = texture_id;- gl->BindTexture(GL_TEXTURE_2D, tex->texture_ids[i]);-- // Enable trilinear filtering for downscaling- gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,- GL_LINEAR_MIPMAP_LINEAR);- gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -1.f);-- gl->BindTexture(GL_TEXTURE_2D, 0);}++ sc_opengl_enable_mipmaps(gl, tex->texture_ids, 3);}return texture;@@ -213,14 +207,7 @@ sc_texture_update(struct sc_texture *tex, const AVFrame *frame) {}if (tex->mipmaps) {- struct sc_opengl *gl = &tex->gl;-- for (unsigned i = 0; i < 3; ++i) {- assert(tex->texture_ids[i]);- gl->BindTexture(GL_TEXTURE_2D, tex->texture_ids[i]);- gl->GenerateMipmap(GL_TEXTURE_2D);- }- gl->BindTexture(GL_TEXTURE_2D, 0);+ sc_opengl_generate_mipmaps(&tex->gl, tex->texture_ids, 3);}return true;