From 0bea144135252886fc86cc97c972ddd3a7b82a15 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 Jul 2018 15:49:29 -0700 Subject: userland: Define missing GLES2 defines needed for weston Signed-off-by: Khem Raj --- ...-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch | 17 +++++++---- ...-EGL_IMG_context_priority-related-defines.patch | 35 ++++++++++++++++++++++ recipes-graphics/userland/userland_git.bb | 1 + 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 recipes-graphics/userland/userland/0018-Add-EGL_IMG_context_priority-related-defines.patch diff --git a/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch index 025b6bc..3da4a48 100644 --- a/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch +++ b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch @@ -1,4 +1,4 @@ -From 8d9299d219a2a4f76f8278973584e1a9f7116c78 Mon Sep 17 00:00:00 2001 +From 6e8562b45a2e14490da2ca258c9ce3d7bc8375f3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 10 May 2017 06:39:34 +0000 Subject: [PATCH 14/16] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT @@ -8,23 +8,28 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - interface/khronos/include/GLES2/gl2ext.h | 3 +++ - 1 file changed, 3 insertions(+) + interface/khronos/include/GLES2/gl2ext.h | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/interface/khronos/include/GLES2/gl2ext.h b/interface/khronos/include/GLES2/gl2ext.h -index 4eacf7f..283e3e1 100644 +index 4eacf7f..b1acc9f 100644 --- a/interface/khronos/include/GLES2/gl2ext.h +++ b/interface/khronos/include/GLES2/gl2ext.h -@@ -327,6 +327,9 @@ typedef void* GLeglImageOES; +@@ -327,6 +327,14 @@ typedef void* GLeglImageOES; #define GL_RGBX_BRCM 0x80EE #endif ++#ifndef GL_EXT_texture_rg ++#define GL_EXT_texture_rg 1 ++#define GL_RED_EXT 0x1903 ++#define GL_RG_EXT 0x8227 +#define GL_R8_EXT 0x8229 +#define GL_RG8_EXT 0x822B ++#endif /* GL_EXT_texture_rg */ + /* GL_EXT_texture_type_2_10_10_10_REV */ #ifndef GL_EXT_texture_type_2_10_10_10_REV #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -- -2.16.1 +2.18.0 diff --git a/recipes-graphics/userland/userland/0018-Add-EGL_IMG_context_priority-related-defines.patch b/recipes-graphics/userland/userland/0018-Add-EGL_IMG_context_priority-related-defines.patch new file mode 100644 index 0000000..330fb3e --- /dev/null +++ b/recipes-graphics/userland/userland/0018-Add-EGL_IMG_context_priority-related-defines.patch @@ -0,0 +1,35 @@ +From ca43aae3e1879d2595cfee80032322f5fdfdea11 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Jul 2018 00:48:38 -0700 +Subject: [PATCH] Add EGL_IMG_context_priority related defines + +These defines are needed for compiling weston 4.x +taken from Khronos headers + +Signed-off-by: Khem Raj +--- + interface/khronos/include/EGL/eglext.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h +index dcc90ce..6842bf9 100755 +--- a/interface/khronos/include/EGL/eglext.h ++++ b/interface/khronos/include/EGL/eglext.h +@@ -93,6 +93,14 @@ typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGL + typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image); + #endif + ++#ifndef EGL_IMG_context_priority ++#define EGL_IMG_context_priority 1 ++#define EGL_CONTEXT_PRIORITY_LEVEL_IMG 0x3102 ++#define EGL_CONTEXT_PRIORITY_HIGH_IMG 0x3101 ++#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG 0x3102 ++#define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103 ++#endif /* EGL_IMG_context_priority */ ++ + #ifndef EGL_KHR_vg_parent_image + #define EGL_KHR_vg_parent_image 1 + #define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */ +-- +2.18.0 + diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 2257d15..3903284 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -39,6 +39,7 @@ SRC_URI = "\ file://0015-EGL-glplatform.h-define-EGL_CAST.patch \ file://0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch \ file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ + file://0018-Add-EGL_IMG_context_priority-related-defines.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf