1From 5b0c8a0d4e5afbb4c13945d8e1b79cc46deea278 Mon Sep 17 00:00:00 2001 2From: Jeffy Chen <jeffy.chen@rock-chips.com> 3Date: Wed, 27 Apr 2022 22:59:32 +0800 4Subject: [PATCH 03/79] Revert "gl-renderer: require GL_EXT_unpack_subimage" 5 6This reverts commit 593d5af43a8e2c2a3371088fa7ae430d0517c82d. 7 8For old mali, e.g. utgard. 9 10Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11--- 12 libweston/renderer-gl/gl-renderer-internal.h | 2 ++ 13 libweston/renderer-gl/gl-renderer.c | 32 +++++++++++++++++--- 14 2 files changed, 29 insertions(+), 5 deletions(-) 15 16diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h 17index d84d9d37..aae303e3 100644 18--- a/libweston/renderer-gl/gl-renderer-internal.h 19+++ b/libweston/renderer-gl/gl-renderer-internal.h 20@@ -148,6 +148,8 @@ struct gl_renderer { 21 PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window; 22 bool has_platform_base; 23 24+ bool has_unpack_subimage; 25+ 26 PFNEGLBINDWAYLANDDISPLAYWL bind_display; 27 PFNEGLUNBINDWAYLANDDISPLAYWL unbind_display; 28 PFNEGLQUERYWAYLANDBUFFERWL query_buffer; 29diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c 30index 3a525698..edb2fba8 100644 31--- a/libweston/renderer-gl/gl-renderer.c 32+++ b/libweston/renderer-gl/gl-renderer.c 33@@ -1793,6 +1793,7 @@ gl_renderer_flush_damage(struct weston_surface *surface, 34 { 35 const struct weston_testsuite_quirks *quirks = 36 &surface->compositor->test_data.test_quirks; 37+ struct gl_renderer *gr = get_renderer(surface->compositor); 38 struct gl_surface_state *gs = get_surface_state(surface); 39 struct gl_buffer_state *gb = gs->buffer; 40 struct weston_view *view; 41@@ -1835,6 +1836,27 @@ gl_renderer_flush_damage(struct weston_surface *surface, 42 43 glActiveTexture(GL_TEXTURE0); 44 45+ if (!gr->has_unpack_subimage) { 46+ wl_shm_buffer_begin_access(buffer->shm_buffer); 47+ for (j = 0; j < gb->num_textures; j++) { 48+ int hsub = pixel_format_hsub(buffer->pixel_format, j); 49+ int vsub = pixel_format_vsub(buffer->pixel_format, j); 50+ 51+ glBindTexture(GL_TEXTURE_2D, gb->textures[j]); 52+ glTexImage2D(GL_TEXTURE_2D, 0, 53+ gb->gl_format[j], 54+ gb->pitch / hsub, 55+ buffer->height / vsub, 56+ 0, 57+ gl_format_from_internal(gb->gl_format[j]), 58+ gb->gl_pixel_type, 59+ data + gb->offset[j]); 60+ } 61+ wl_shm_buffer_end_access(buffer->shm_buffer); 62+ 63+ goto done; 64+ } 65+ 66 if (gb->needs_full_upload || quirks->gl_force_full_upload) { 67 glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0); 68 glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0); 69@@ -3878,11 +3900,9 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) 70 else 71 ec->read_format = pixel_format_get_info_by_pixman(PIXMAN_a8b8g8r8); 72 73- if (gr->gl_version < gr_gl_version(3, 0) && 74- !weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) { 75- weston_log("GL_EXT_unpack_subimage not available.\n"); 76- return -1; 77- } 78+ if (gr->gl_version >= gr_gl_version(3, 0) || 79+ weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) 80+ gr->has_unpack_subimage = true; 81 82 if (gr->gl_version >= gr_gl_version(3, 0) || 83 weston_check_egl_extension(extensions, "GL_EXT_texture_type_2_10_10_10_REV")) 84@@ -3937,6 +3957,8 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) 85 yesno(gr->has_gl_texture_rg)); 86 weston_log_continue(STAMP_SPACE "OES_EGL_image_external: %s\n", 87 yesno(gr->has_egl_image_external)); 88+ weston_log_continue(STAMP_SPACE "wl_shm sub-image to texture: %s\n", 89+ gr->has_unpack_subimage ? "yes" : "no"); 90 91 return 0; 92 } 93-- 942.20.1 95 96