Merge pull request #3338 from GeorgesStavracas/feaneron/egl-dmabuf

DMA-BUF importing for EGL renderers
master
Jim 2021-02-13 21:10:09 -08:00 committed by GitHub
commit 622d2f7658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 553 additions and 7 deletions

View File

@ -7,21 +7,24 @@
APIs: egl=1.5 APIs: egl=1.5
Profile: - Profile: -
Extensions: Extensions:
EGL_EXT_image_dma_buf_import,
EGL_EXT_image_dma_buf_import_modifiers,
EGL_EXT_platform_wayland, EGL_EXT_platform_wayland,
EGL_EXT_platform_x11, EGL_EXT_platform_x11,
EGL_KHR_create_context, EGL_KHR_create_context,
EGL_KHR_create_context_no_error, EGL_KHR_create_context_no_error,
EGL_KHR_platform_wayland, EGL_KHR_platform_wayland,
EGL_KHR_platform_x11 EGL_KHR_platform_x11,
EGL_MESA_image_dma_buf_export
Loader: True Loader: True
Local files: False Local files: False
Omit khrplatform: False Omit khrplatform: False
Reproducible: False Reproducible: False
Commandline: Commandline:
--api="egl=1.5" --generator="c" --spec="egl" --extensions="EGL_EXT_platform_wayland,EGL_EXT_platform_x11,EGL_KHR_create_context,EGL_KHR_create_context_no_error,EGL_KHR_platform_wayland,EGL_KHR_platform_x11" --api="egl=1.5" --generator="c" --spec="egl" --extensions="EGL_EXT_image_dma_buf_import,EGL_EXT_image_dma_buf_import_modifiers,EGL_EXT_platform_wayland,EGL_EXT_platform_x11,EGL_KHR_create_context,EGL_KHR_create_context_no_error,EGL_KHR_platform_wayland,EGL_KHR_platform_x11"
Online: Online:
https://glad.dav1d.de/#language=c&specification=egl&loader=on&api=egl%3D1.5&extensions=EGL_EXT_platform_wayland&extensions=EGL_EXT_platform_x11&extensions=EGL_KHR_create_context&extensions=EGL_KHR_create_context_no_error&extensions=EGL_KHR_platform_wayland&extensions=EGL_KHR_platform_x11 https://glad.dav1d.de/#language=c&specification=egl&loader=on&api=egl%3D1.5&extensions=EGL_EXT_image_dma_buf_import&extensions=EGL_EXT_image_dma_buf_import_modifiers&extensions=EGL_EXT_platform_wayland&extensions=EGL_EXT_platform_x11&extensions=EGL_KHR_create_context&extensions=EGL_KHR_create_context_no_error&extensions=EGL_KHR_platform_wayland&extensions=EGL_KHR_platform_x11
*/ */
@ -339,6 +342,39 @@ EGLDisplay eglGetPlatformDisplay(EGLenum platform, void *native_display, const E
EGLSurface eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); EGLSurface eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
EGLSurface eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); EGLSurface eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
EGLBoolean eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags); EGLBoolean eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
#define EGL_LINUX_DMA_BUF_EXT 0x3270
#define EGL_LINUX_DRM_FOURCC_EXT 0x3271
#define EGL_DMA_BUF_PLANE0_FD_EXT 0x3272
#define EGL_DMA_BUF_PLANE0_OFFSET_EXT 0x3273
#define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274
#define EGL_DMA_BUF_PLANE1_FD_EXT 0x3275
#define EGL_DMA_BUF_PLANE1_OFFSET_EXT 0x3276
#define EGL_DMA_BUF_PLANE1_PITCH_EXT 0x3277
#define EGL_DMA_BUF_PLANE2_FD_EXT 0x3278
#define EGL_DMA_BUF_PLANE2_OFFSET_EXT 0x3279
#define EGL_DMA_BUF_PLANE2_PITCH_EXT 0x327A
#define EGL_YUV_COLOR_SPACE_HINT_EXT 0x327B
#define EGL_SAMPLE_RANGE_HINT_EXT 0x327C
#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E
#define EGL_ITU_REC601_EXT 0x327F
#define EGL_ITU_REC709_EXT 0x3280
#define EGL_ITU_REC2020_EXT 0x3281
#define EGL_YUV_FULL_RANGE_EXT 0x3282
#define EGL_YUV_NARROW_RANGE_EXT 0x3283
#define EGL_YUV_CHROMA_SITING_0_EXT 0x3284
#define EGL_YUV_CHROMA_SITING_0_5_EXT 0x3285
#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440
#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441
#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442
#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443
#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444
#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445
#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446
#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447
#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448
#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449
#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A
#define EGL_PLATFORM_WAYLAND_EXT 0x31D8 #define EGL_PLATFORM_WAYLAND_EXT 0x31D8
#define EGL_PLATFORM_X11_EXT 0x31D5 #define EGL_PLATFORM_X11_EXT 0x31D5
#define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6 #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6
@ -359,6 +395,18 @@ EGLBoolean eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
#define EGL_PLATFORM_WAYLAND_KHR 0x31D8 #define EGL_PLATFORM_WAYLAND_KHR 0x31D8
#define EGL_PLATFORM_X11_KHR 0x31D5 #define EGL_PLATFORM_X11_KHR 0x31D5
#define EGL_PLATFORM_X11_SCREEN_KHR 0x31D6 #define EGL_PLATFORM_X11_SCREEN_KHR 0x31D6
#ifndef EGL_EXT_image_dma_buf_import
#define EGL_EXT_image_dma_buf_import 1
#endif
#ifndef EGL_EXT_image_dma_buf_import_modifiers
#define EGL_EXT_image_dma_buf_import_modifiers 1
typedef EGLBoolean (APIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC)(EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats);
GLAPI PFNEGLQUERYDMABUFFORMATSEXTPROC glad_eglQueryDmaBufFormatsEXT;
#define eglQueryDmaBufFormatsEXT glad_eglQueryDmaBufFormatsEXT
typedef EGLBoolean (APIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC)(EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers);
GLAPI PFNEGLQUERYDMABUFMODIFIERSEXTPROC glad_eglQueryDmaBufModifiersEXT;
#define eglQueryDmaBufModifiersEXT glad_eglQueryDmaBufModifiersEXT
#endif
#ifndef EGL_EXT_platform_wayland #ifndef EGL_EXT_platform_wayland
#define EGL_EXT_platform_wayland 1 #define EGL_EXT_platform_wayland 1
#endif #endif
@ -377,6 +425,15 @@ EGLBoolean eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
#ifndef EGL_KHR_platform_x11 #ifndef EGL_KHR_platform_x11
#define EGL_KHR_platform_x11 1 #define EGL_KHR_platform_x11 1
#endif #endif
#ifndef EGL_MESA_image_dma_buf_export
#define EGL_MESA_image_dma_buf_export 1
typedef EGLBoolean (APIENTRYP PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC)(EGLDisplay dpy, EGLImageKHR image, int *fourcc, int *num_planes, EGLuint64KHR *modifiers);
GLAPI PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC glad_eglExportDMABUFImageQueryMESA;
#define eglExportDMABUFImageQueryMESA glad_eglExportDMABUFImageQueryMESA
typedef EGLBoolean (APIENTRYP PFNEGLEXPORTDMABUFIMAGEMESAPROC)(EGLDisplay dpy, EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
GLAPI PFNEGLEXPORTDMABUFIMAGEMESAPROC glad_eglExportDMABUFImageMESA;
#define eglExportDMABUFImageMESA glad_eglExportDMABUFImageMESA
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -1,25 +1,28 @@
/* /*
EGL loader generated by glad 0.1.33 on Mon Mar 9 17:01:26 2020. EGL loader generated by glad 0.1.33 on Fri Mar 13 03:53:53 2020.
Language/Generator: C/C++ Language/Generator: C/C++
Specification: egl Specification: egl
APIs: egl=1.5 APIs: egl=1.5
Profile: - Profile: -
Extensions: Extensions:
EGL_EXT_image_dma_buf_import,
EGL_EXT_image_dma_buf_import_modifiers,
EGL_EXT_platform_wayland, EGL_EXT_platform_wayland,
EGL_EXT_platform_x11, EGL_EXT_platform_x11,
EGL_KHR_platform_wayland, EGL_KHR_platform_wayland,
EGL_KHR_platform_x11 EGL_KHR_platform_x11,
EGL_MESA_image_dma_buf_export
Loader: True Loader: True
Local files: False Local files: False
Omit khrplatform: False Omit khrplatform: False
Reproducible: False Reproducible: False
Commandline: Commandline:
--api="egl=1.5" --generator="c" --spec="egl" --extensions="EGL_EXT_platform_wayland,EGL_EXT_platform_x11,EGL_KHR_platform_wayland,EGL_KHR_platform_x11" --api="egl=1.5" --generator="c" --spec="egl" --extensions="EGL_EXT_image_dma_buf_import,EGL_EXT_image_dma_buf_import_modifiers,EGL_EXT_platform_wayland,EGL_EXT_platform_x11,EGL_KHR_platform_wayland,EGL_KHR_platform_x11,EGL_MESA_image_dma_buf_export"
Online: Online:
https://glad.dav1d.de/#language=c&specification=egl&loader=on&api=egl%3D1.5&extensions=EGL_EXT_platform_wayland&extensions=EGL_EXT_platform_x11&extensions=EGL_KHR_platform_wayland&extensions=EGL_KHR_platform_x11 https://glad.dav1d.de/#language=c&specification=egl&loader=on&api=egl%3D1.5&extensions=EGL_EXT_image_dma_buf_import&extensions=EGL_EXT_image_dma_buf_import_modifiers&extensions=EGL_EXT_platform_wayland&extensions=EGL_EXT_platform_x11&extensions=EGL_KHR_platform_wayland&extensions=EGL_KHR_platform_x11&extensions=EGL_MESA_image_dma_buf_export
*/ */
#include <stdio.h> #include <stdio.h>
@ -31,6 +34,18 @@ int gladLoadEGL(void) {
return gladLoadEGLLoader((GLADloadproc)eglGetProcAddress); return gladLoadEGLLoader((GLADloadproc)eglGetProcAddress);
} }
PFNEGLQUERYDMABUFFORMATSEXTPROC glad_eglQueryDmaBufFormatsEXT = NULL;
PFNEGLQUERYDMABUFMODIFIERSEXTPROC glad_eglQueryDmaBufModifiersEXT = NULL;
PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC glad_eglExportDMABUFImageQueryMESA = NULL;
PFNEGLEXPORTDMABUFIMAGEMESAPROC glad_eglExportDMABUFImageMESA = NULL;
static void load_EGL_EXT_image_dma_buf_import_modifiers(GLADloadproc load) {
glad_eglQueryDmaBufFormatsEXT = (PFNEGLQUERYDMABUFFORMATSEXTPROC)load("eglQueryDmaBufFormatsEXT");
glad_eglQueryDmaBufModifiersEXT = (PFNEGLQUERYDMABUFMODIFIERSEXTPROC)load("eglQueryDmaBufModifiersEXT");
}
static void load_EGL_MESA_image_dma_buf_export(GLADloadproc load) {
glad_eglExportDMABUFImageQueryMESA = (PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC)load("eglExportDMABUFImageQueryMESA");
glad_eglExportDMABUFImageMESA = (PFNEGLEXPORTDMABUFIMAGEMESAPROC)load("eglExportDMABUFImageMESA");
}
static int find_extensionsEGL(void) { static int find_extensionsEGL(void) {
return 1; return 1;
} }
@ -43,6 +58,8 @@ int gladLoadEGLLoader(GLADloadproc load) {
find_coreEGL(); find_coreEGL();
if (!find_extensionsEGL()) return 0; if (!find_extensionsEGL()) return 0;
load_EGL_EXT_image_dma_buf_import_modifiers(load);
load_EGL_MESA_image_dma_buf_export(load);
return 1; return 1;
} }

View File

@ -45,6 +45,7 @@ else()
${X11_XCB_LIBRARIES}) ${X11_XCB_LIBRARIES})
set(libobs-opengl_PLATFORM_SOURCES set(libobs-opengl_PLATFORM_SOURCES
gl-egl-common.c
gl-nix.c gl-nix.c
gl-x11-egl.c gl-x11-egl.c
gl-x11-glx.c) gl-x11-glx.c)

View File

@ -0,0 +1,340 @@
/******************************************************************************
Copyright (C) 2020 by Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "gl-egl-common.h"
#include <stdio.h>
#include <stdlib.h>
#include <glad/glad_egl.h>
#if defined(__linux__)
#include <linux/types.h>
#include <asm/ioctl.h>
typedef unsigned int drm_handle_t;
#else
#include <stdint.h>
#include <sys/ioccom.h>
#include <sys/types.h>
typedef int8_t __s8;
typedef uint8_t __u8;
typedef int16_t __s16;
typedef uint16_t __u16;
typedef int32_t __s32;
typedef uint32_t __u32;
typedef int64_t __s64;
typedef uint64_t __u64;
typedef size_t __kernel_size_t;
typedef unsigned long drm_handle_t;
#endif
typedef void(APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)(
GLenum target, GLeglImageOES image);
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
/* copied from drm_fourcc.h */
#define fourcc_code(a, b, c, d) \
((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | \
((__u32)(d) << 24))
#define DRM_FORMAT_INVALID 0
#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */
#define DRM_FORMAT_R16 \
fourcc_code('R', '1', '6', ' ') /* [15:0] R little endian */
#define DRM_FORMAT_RG88 \
fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */
#define DRM_FORMAT_ABGR8888 \
fourcc_code('A', 'B', '2', \
'4') /* [31:0] A:B:G:R 8:8:8:8 little endian */
#define DRM_FORMAT_ABGR2101010 \
fourcc_code('A', 'B', '3', \
'0') /* [31:0] A:B:G:R 2:10:10:10 little endian */
#define DRM_FORMAT_ABGR16161616F \
fourcc_code('A', 'B', '4', \
'H') /* [63:0] A:B:G:R 16:16:16:16 little endian */
#define DRM_FORMAT_ARGB8888 \
fourcc_code('A', 'R', '2', \
'4') /* [31:0] A:R:G:B 8:8:8:8 little endian */
#define DRM_FORMAT_XRGB8888 \
fourcc_code('X', 'R', '2', \
'4') /* [31:0] x:R:G:B 8:8:8:8 little endian */
static bool find_gl_extension(const char *extension)
{
GLint n, i;
glGetIntegerv(GL_NUM_EXTENSIONS, &n);
for (i = 0; i < n; i++) {
const char *e = (char *)glGetStringi(GL_EXTENSIONS, i);
if (extension && strcmp(e, extension) == 0)
return true;
}
return false;
}
static bool init_egl_image_target_texture_2d_ext(void)
{
static bool initialized = false;
if (!initialized) {
initialized = true;
if (!find_gl_extension("GL_OES_EGL_image")) {
blog(LOG_ERROR, "No GL_OES_EGL_image");
return false;
}
glEGLImageTargetTexture2DOES =
(PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)eglGetProcAddress(
"glEGLImageTargetTexture2DOES");
}
if (!glEGLImageTargetTexture2DOES)
return false;
return true;
}
static inline enum gs_color_format gs_format_to_drm_format(uint32_t drm_format)
{
switch (drm_format) {
case GS_R8:
return DRM_FORMAT_R8;
case GS_RGBA:
return DRM_FORMAT_ABGR8888;
case GS_BGRX:
return DRM_FORMAT_XRGB8888;
case GS_BGRA:
return DRM_FORMAT_ARGB8888;
case GS_R10G10B10A2:
return DRM_FORMAT_ABGR2101010;
case GS_R16:
return DRM_FORMAT_R16;
case GS_RGBA16F:
return DRM_FORMAT_ABGR16161616F;
case GS_R8G8:
return DRM_FORMAT_RG88;
case GS_A8:
case GS_R16F:
case GS_RGBA16:
case GS_RG16F:
case GS_R32F:
case GS_RG32F:
case GS_RGBA32F:
case GS_DXT1:
case GS_DXT3:
case GS_DXT5:
case GS_UNKNOWN:
return DRM_FORMAT_INVALID;
}
return DRM_FORMAT_INVALID;
}
static EGLImageKHR
create_dmabuf_egl_image(EGLDisplay egl_display, unsigned int width,
unsigned int height, uint32_t drm_format,
uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers)
{
EGLAttrib attribs[47];
int atti = 0;
/* This requires the Mesa commit in
* Mesa 10.3 (08264e5dad4df448e7718e782ad9077902089a07) or
* Mesa 10.2.7 (55d28925e6109a4afd61f109e845a8a51bd17652).
* Otherwise Mesa closes the fd behind our back and re-importing
* will fail.
* https://bugs.freedesktop.org/show_bug.cgi?id=76188
* */
attribs[atti++] = EGL_WIDTH;
attribs[atti++] = width;
attribs[atti++] = EGL_HEIGHT;
attribs[atti++] = height;
attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
attribs[atti++] = drm_format;
if (n_planes > 0) {
attribs[atti++] = EGL_DMA_BUF_PLANE0_FD_EXT;
attribs[atti++] = fds[0];
attribs[atti++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
attribs[atti++] = offsets[0];
attribs[atti++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
attribs[atti++] = strides[0];
if (modifiers) {
attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
attribs[atti++] = modifiers[0] & 0xFFFFFFFF;
attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
attribs[atti++] = modifiers[0] >> 32;
}
}
if (n_planes > 1) {
attribs[atti++] = EGL_DMA_BUF_PLANE1_FD_EXT;
attribs[atti++] = fds[1];
attribs[atti++] = EGL_DMA_BUF_PLANE1_OFFSET_EXT;
attribs[atti++] = offsets[1];
attribs[atti++] = EGL_DMA_BUF_PLANE1_PITCH_EXT;
attribs[atti++] = strides[1];
if (modifiers) {
attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT;
attribs[atti++] = modifiers[1] & 0xFFFFFFFF;
attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT;
attribs[atti++] = modifiers[1] >> 32;
}
}
if (n_planes > 2) {
attribs[atti++] = EGL_DMA_BUF_PLANE2_FD_EXT;
attribs[atti++] = fds[2];
attribs[atti++] = EGL_DMA_BUF_PLANE2_OFFSET_EXT;
attribs[atti++] = offsets[2];
attribs[atti++] = EGL_DMA_BUF_PLANE2_PITCH_EXT;
attribs[atti++] = strides[2];
if (modifiers) {
attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT;
attribs[atti++] = modifiers[2] & 0xFFFFFFFF;
attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT;
attribs[atti++] = modifiers[2] >> 32;
}
}
if (n_planes > 3) {
attribs[atti++] = EGL_DMA_BUF_PLANE3_FD_EXT;
attribs[atti++] = fds[3];
attribs[atti++] = EGL_DMA_BUF_PLANE3_OFFSET_EXT;
attribs[atti++] = offsets[3];
attribs[atti++] = EGL_DMA_BUF_PLANE3_PITCH_EXT;
attribs[atti++] = strides[3];
if (modifiers) {
attribs[atti++] = EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT;
attribs[atti++] = modifiers[3] & 0xFFFFFFFF;
attribs[atti++] = EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT;
attribs[atti++] = modifiers[3] >> 32;
}
}
attribs[atti++] = EGL_NONE;
return eglCreateImage(egl_display, EGL_NO_CONTEXT,
EGL_LINUX_DMA_BUF_EXT, 0, attribs);
}
struct gs_texture *
gl_egl_create_dmabuf_image(EGLDisplay egl_display, unsigned int width,
unsigned int height,
enum gs_color_format color_format, uint32_t n_planes,
const int *fds, const uint32_t *strides,
const uint32_t *offsets, const uint64_t *modifiers)
{
struct gs_texture *texture = NULL;
EGLImage egl_image;
uint32_t drm_format;
if (!init_egl_image_target_texture_2d_ext())
return NULL;
drm_format = gs_format_to_drm_format(color_format);
if (drm_format == DRM_FORMAT_INVALID) {
blog(LOG_ERROR, "Invalid or unsupported image format");
return NULL;
}
egl_image = create_dmabuf_egl_image(egl_display, width, height,
drm_format, n_planes, fds, strides,
offsets, modifiers);
if (egl_image == EGL_NO_IMAGE) {
blog(LOG_ERROR, "Cannot create EGLImage: %s",
gl_egl_error_to_string(eglGetError()));
return NULL;
}
texture = gs_texture_create(width, height, color_format, 1, NULL,
GS_DYNAMIC);
const GLuint gltex = *(GLuint *)gs_texture_get_obj(texture);
glBindTexture(GL_TEXTURE_2D, gltex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, egl_image);
glBindTexture(GL_TEXTURE_2D, 0);
eglDestroyImage(egl_display, egl_image);
return texture;
}
const char *gl_egl_error_to_string(EGLint error_number)
{
switch (error_number) {
case EGL_SUCCESS:
return "The last function succeeded without error.";
break;
case EGL_NOT_INITIALIZED:
return "EGL is not initialized, or could not be initialized, for the specified EGL display connection.";
break;
case EGL_BAD_ACCESS:
return "EGL cannot access a requested resource (for example a context is bound in another thread).";
break;
case EGL_BAD_ALLOC:
return "EGL failed to allocate resources for the requested operation.";
break;
case EGL_BAD_ATTRIBUTE:
return "An unrecognized attribute or attribute value was passed in the attribute list.";
break;
case EGL_BAD_CONTEXT:
return "An EGLContext argument does not name a valid EGL rendering context.";
break;
case EGL_BAD_CONFIG:
return "An EGLConfig argument does not name a valid EGL frame buffer configuration.";
break;
case EGL_BAD_CURRENT_SURFACE:
return "The current surface of the calling thread is a window, pixel buffer or pixmap that is no longer valid.";
break;
case EGL_BAD_DISPLAY:
return "An EGLDisplay argument does not name a valid EGL display connection.";
break;
case EGL_BAD_SURFACE:
return "An EGLSurface argument does not name a valid surface (window, pixel buffer or pixmap) configured for GL rendering.";
break;
case EGL_BAD_MATCH:
return "Arguments are inconsistent (for example, a valid context requires buffers not supplied by a valid surface).";
break;
case EGL_BAD_PARAMETER:
return "One or more argument values are invalid.";
break;
case EGL_BAD_NATIVE_PIXMAP:
return "A NativePixmapType argument does not refer to a valid native pixmap.";
break;
case EGL_BAD_NATIVE_WINDOW:
return "A NativeWindowType argument does not refer to a valid native window.";
break;
case EGL_CONTEXT_LOST:
return "A power management event has occurred. The application must destroy all contexts and reinitialise OpenGL ES state and objects to continue rendering. ";
break;
default:
return "Unknown error";
break;
}
}

View File

@ -0,0 +1,14 @@
#pragma once
#include "gl-nix.h"
#include <glad/glad_egl.h>
const char *gl_egl_error_to_string(EGLint error_number);
struct gs_texture *
gl_egl_create_dmabuf_image(EGLDisplay egl_display, unsigned int width,
unsigned int height,
enum gs_color_format color_format, uint32_t n_planes,
const int *fds, const uint32_t *strides,
const uint32_t *offsets, const uint64_t *modifiers);

View File

@ -123,3 +123,14 @@ extern void device_present(gs_device_t *device)
{ {
gl_vtable->device_present(device); gl_vtable->device_present(device);
} }
extern struct gs_texture *device_texture_create_from_dmabuf(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers)
{
return gl_vtable->device_texture_create_from_dmabuf(
device, width, height, color_format, n_planes, fds, strides,
offsets, modifiers);
}

View File

@ -53,4 +53,10 @@ struct gl_winsys_vtable {
gs_swapchain_t *swap); gs_swapchain_t *swap);
void (*device_present)(gs_device_t *device); void (*device_present)(gs_device_t *device);
struct gs_texture *(*device_texture_create_from_dmabuf)(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes,
const int *fds, const uint32_t *strides,
const uint32_t *offsets, const uint64_t *modifiers);
}; };

View File

@ -20,6 +20,8 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-egl.h> #include <wayland-egl.h>
#include "gl-egl-common.h"
#include <glad/glad_egl.h> #include <glad/glad_egl.h>
static const EGLint config_attribs[] = {EGL_SURFACE_TYPE, static const EGLint config_attribs[] = {EGL_SURFACE_TYPE,
@ -319,6 +321,19 @@ static void gl_wayland_egl_device_present(gs_device_t *device)
} }
} }
static struct gs_texture *gl_wayland_egl_device_texture_create_from_dmabuf(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers)
{
struct gl_platform *plat = device->plat;
return gl_egl_create_dmabuf_image(plat->display, width, height,
color_format, n_planes, fds, strides,
offsets, modifiers);
}
static const struct gl_winsys_vtable egl_wayland_winsys_vtable = { static const struct gl_winsys_vtable egl_wayland_winsys_vtable = {
.windowinfo_create = gl_wayland_egl_windowinfo_create, .windowinfo_create = gl_wayland_egl_windowinfo_create,
.windowinfo_destroy = gl_wayland_egl_windowinfo_destroy, .windowinfo_destroy = gl_wayland_egl_windowinfo_destroy,
@ -334,6 +349,8 @@ static const struct gl_winsys_vtable egl_wayland_winsys_vtable = {
.update = gl_wayland_egl_update, .update = gl_wayland_egl_update,
.device_load_swapchain = gl_wayland_egl_device_load_swapchain, .device_load_swapchain = gl_wayland_egl_device_load_swapchain,
.device_present = gl_wayland_egl_device_present, .device_present = gl_wayland_egl_device_present,
.device_texture_create_from_dmabuf =
gl_wayland_egl_device_texture_create_from_dmabuf,
}; };
const struct gl_winsys_vtable *gl_wayland_egl_get_winsys_vtable(void) const struct gl_winsys_vtable *gl_wayland_egl_get_winsys_vtable(void)

View File

@ -29,6 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include "gl-egl-common.h"
#include "gl-x11-egl.h" #include "gl-x11-egl.h"
#include <glad/glad_egl.h> #include <glad/glad_egl.h>
@ -634,6 +635,19 @@ static void gl_x11_egl_device_present(gs_device_t *device)
get_egl_error_string()); get_egl_error_string());
} }
static struct gs_texture *gl_x11_egl_device_texture_create_from_dmabuf(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers)
{
struct gl_platform *plat = device->plat;
return gl_egl_create_dmabuf_image(plat->edisplay, width, height,
color_format, n_planes, fds, strides,
offsets, modifiers);
}
static const struct gl_winsys_vtable egl_x11_winsys_vtable = { static const struct gl_winsys_vtable egl_x11_winsys_vtable = {
.windowinfo_create = gl_x11_egl_windowinfo_create, .windowinfo_create = gl_x11_egl_windowinfo_create,
.windowinfo_destroy = gl_x11_egl_windowinfo_destroy, .windowinfo_destroy = gl_x11_egl_windowinfo_destroy,
@ -649,6 +663,8 @@ static const struct gl_winsys_vtable egl_x11_winsys_vtable = {
.update = gl_x11_egl_update, .update = gl_x11_egl_update,
.device_load_swapchain = gl_x11_egl_device_load_swapchain, .device_load_swapchain = gl_x11_egl_device_load_swapchain,
.device_present = gl_x11_egl_device_present, .device_present = gl_x11_egl_device_present,
.device_texture_create_from_dmabuf =
gl_x11_egl_device_texture_create_from_dmabuf,
}; };
const struct gl_winsys_vtable *gl_x11_egl_get_winsys_vtable(void) const struct gl_winsys_vtable *gl_x11_egl_get_winsys_vtable(void)

View File

@ -579,6 +579,25 @@ static void gl_x11_glx_device_present(gs_device_t *device)
glXSwapBuffers(display, window); glXSwapBuffers(display, window);
} }
static struct gs_texture *gl_x11_glx_device_texture_create_from_dmabuf(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers)
{
UNUSED_PARAMETER(device);
UNUSED_PARAMETER(width);
UNUSED_PARAMETER(height);
UNUSED_PARAMETER(color_format);
UNUSED_PARAMETER(n_planes);
UNUSED_PARAMETER(fds);
UNUSED_PARAMETER(strides);
UNUSED_PARAMETER(offsets);
UNUSED_PARAMETER(modifiers);
return NULL;
}
static const struct gl_winsys_vtable glx_winsys_vtable = { static const struct gl_winsys_vtable glx_winsys_vtable = {
.windowinfo_create = gl_x11_glx_windowinfo_create, .windowinfo_create = gl_x11_glx_windowinfo_create,
.windowinfo_destroy = gl_x11_glx_windowinfo_destroy, .windowinfo_destroy = gl_x11_glx_windowinfo_destroy,
@ -594,6 +613,8 @@ static const struct gl_winsys_vtable glx_winsys_vtable = {
.update = gl_x11_glx_update, .update = gl_x11_glx_update,
.device_load_swapchain = gl_x11_glx_device_load_swapchain, .device_load_swapchain = gl_x11_glx_device_load_swapchain,
.device_present = gl_x11_glx_device_present, .device_present = gl_x11_glx_device_present,
.device_texture_create_from_dmabuf =
gl_x11_glx_device_texture_create_from_dmabuf,
}; };
const struct gl_winsys_vtable *gl_x11_glx_get_winsys_vtable(void) const struct gl_winsys_vtable *gl_x11_glx_get_winsys_vtable(void)

View File

@ -170,6 +170,16 @@ EXPORT void device_debug_marker_begin(gs_device_t *device,
const float color[4]); const float color[4]);
EXPORT void device_debug_marker_end(gs_device_t *device); EXPORT void device_debug_marker_end(gs_device_t *device);
#if __linux__
EXPORT gs_texture_t *device_texture_create_from_dmabuf(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -222,6 +222,8 @@ bool load_graphics_imports(struct gs_exports *exports, void *module,
GRAPHICS_IMPORT_OPTIONAL(device_stagesurface_create_nv12); GRAPHICS_IMPORT_OPTIONAL(device_stagesurface_create_nv12);
GRAPHICS_IMPORT_OPTIONAL(device_register_loss_callbacks); GRAPHICS_IMPORT_OPTIONAL(device_register_loss_callbacks);
GRAPHICS_IMPORT_OPTIONAL(device_unregister_loss_callbacks); GRAPHICS_IMPORT_OPTIONAL(device_unregister_loss_callbacks);
#elif __linux__
GRAPHICS_IMPORT(device_texture_create_from_dmabuf);
#endif #endif
return success; return success;

View File

@ -325,6 +325,12 @@ struct gs_exports {
gs_device_t *device, const struct gs_device_loss *callbacks); gs_device_t *device, const struct gs_device_loss *callbacks);
void (*device_unregister_loss_callbacks)(gs_device_t *device, void (*device_unregister_loss_callbacks)(gs_device_t *device,
void *data); void *data);
#elif __linux__
struct gs_texture *(*device_texture_create_from_dmabuf)(
gs_device_t *device, unsigned int width, unsigned int height,
enum gs_color_format color_format, uint32_t n_planes,
const int *fds, const uint32_t *strides,
const uint32_t *offsets, const uint64_t *modifiers);
#endif #endif
}; };

View File

@ -1363,6 +1363,25 @@ gs_texture_t *gs_texture_create(uint32_t width, uint32_t height,
levels, data, flags); levels, data, flags);
} }
#if __linux__
gs_texture_t *gs_texture_create_from_dmabuf(unsigned int width,
unsigned int height,
enum gs_color_format color_format,
uint32_t n_planes, const int *fds,
const uint32_t *strides,
const uint32_t *offsets,
const uint64_t *modifiers)
{
graphics_t *graphics = thread_graphics;
return graphics->exports.device_texture_create_from_dmabuf(
graphics->device, width, height, color_format, n_planes, fds,
strides, offsets, modifiers);
}
#endif
gs_texture_t *gs_cubetexture_create(uint32_t size, gs_texture_t *gs_cubetexture_create(uint32_t size,
enum gs_color_format color_format, enum gs_color_format color_format,
uint32_t levels, const uint8_t **data, uint32_t levels, const uint8_t **data,

View File

@ -913,6 +913,15 @@ EXPORT gs_stagesurf_t *gs_stagesurface_create_nv12(uint32_t width,
EXPORT void gs_register_loss_callbacks(const struct gs_device_loss *callbacks); EXPORT void gs_register_loss_callbacks(const struct gs_device_loss *callbacks);
EXPORT void gs_unregister_loss_callbacks(void *data); EXPORT void gs_unregister_loss_callbacks(void *data);
#elif __linux__
EXPORT gs_texture_t *
gs_texture_create_from_dmabuf(unsigned int width, unsigned int height,
enum gs_color_format color_format,
uint32_t n_planes, const int *fds,
const uint32_t *strides, const uint32_t *offsets,
const uint64_t *modifiers);
#endif #endif
/* inline functions used by modules */ /* inline functions used by modules */