Attachment #594980 for bug #699190

View | Details | Raw Unified | Return to bug 699190
Collapse All | Expand All

Lines 57-63 typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL Link Here

(-)a/src/hardwareintegration/client/dmabuf-server/dmabufserverbufferintegration.h (-1 / +2 lines)
57	#endif	57	#endif
58		58
59	#ifndef GL_OES_EGL_image	59	#ifndef GL_OES_EGL_image
60	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);	60	typedef void *GLeglImageOES;
		61	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
61	#endif	62	#endif
62		63
63	QT_BEGIN_NAMESPACE	64	QT_BEGIN_NAMESPACE

Lines 57-63 typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL Link Here

(-)a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h (-1 / +2 lines)
57	#endif	57	#endif
58		58
59	#ifndef GL_OES_EGL_image	59	#ifndef GL_OES_EGL_image
60	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);	60	typedef void *GLeglImageOES;
		61	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
61	#endif	62	#endif
62		63
63	QT_BEGIN_NAMESPACE	64	QT_BEGIN_NAMESPACE

Lines 62-68 typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL Link Here

(-)a/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h (-1 / +2 lines)
62	#endif	62	#endif
63		63
64	#ifndef GL_OES_EGL_image	64	#ifndef GL_OES_EGL_image
65	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);	65	typedef void *GLeglImageOES;
		66	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
66	#endif	67	#endif
67		68
68	#ifndef EGL_MESA_image_dma_buf_export	69	#ifndef EGL_MESA_image_dma_buf_export

Lines 62-69 typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL Link Here

(-)a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h (-1 / +3 lines)
62	#endif	62	#endif
63		63
64	#ifndef GL_OES_EGL_image	64	#ifndef GL_OES_EGL_image
65	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);	65	typedef void *GLeglImageOES;
		66	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
66	#endif	67	#endif
		68
67	#ifndef EGL_MESA_drm_image	69	#ifndef EGL_MESA_drm_image
68	typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);	70	typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);
69	typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint name, EGLint handle, EGLint *stride);	71	typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint name, EGLint handle, EGLint *stride);




#include <EGL/egl.h>
#include <EGL/eglext.h>

#ifndef EGL_WL_bind_wayland_display
typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
#endif

#ifndef GL_OES_EGL_image
#define GL_OES_EGL_image
typedef void *GLeglImageOES;
typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum target, GLeglImageOES image);
#endif

// compatibility with libdrm <= 2.4.74
#ifndef DRM_FORMAT_RESERVED
#define DRM_FORMAT_RESERVED           ((1ULL << 56) - 1)

Lines 117-124 typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL Link Here

(-)a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp (-2 / +3 lines)
117	#endif	117	#endif
118		118
119	#ifndef GL_OES_EGL_image	119	#ifndef GL_OES_EGL_image
120	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);	120	typedef void *GLeglImageOES;
121	typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);	121	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
		122	typedef void (*PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
122	#endif	123	#endif
123		124
124	QT_BEGIN_NAMESPACE	125	QT_BEGIN_NAMESPACE

Return to bug 699190

Lines 54-59 Link Here

(-)a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h (+11 lines)
54	#include <EGL/egl.h>	54	#include <EGL/egl.h>
55	#include <EGL/eglext.h>	55	#include <EGL/eglext.h>
56		56
		57	#ifndef EGL_WL_bind_wayland_display
		58	typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
		59	typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
		60	#endif
		61
		62	#ifndef GL_OES_EGL_image
		63	#define GL_OES_EGL_image
		64	typedef void *GLeglImageOES;
		65	typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum target, GLeglImageOES image);
		66	#endif
		67
57	// compatibility with libdrm <= 2.4.74	68	// compatibility with libdrm <= 2.4.74
58	#ifndef DRM_FORMAT_RESERVED	69	#ifndef DRM_FORMAT_RESERVED
59	#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)	70	#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)