Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h
An easy-ish way of upgrading a single source file from an upstream and keeping the changes that were done on top, is to branch out from the last update-commit, and update there. Then when merged, git will understand that the changes on top should still be applied when merging. Unfortunately, it breaks as soon as someone does an update and resolved this manually in the update-commit, because in that case git will have no clue about the difference between the previous upstream and the diffs on top. On Fri, Sep 9, 2016 at 5:00 PM, Emil Velikov wrote: > On 9 September 2016 at 15:26, Kyle Brenneman wrote: >> Would it be better to use the new upstream version of eglext.h and add the >> #includes, or to keep Mesa's existing eglext.h and add the missing >> declarations for EGL_KHR_debug? >> > Afaict we've been doing the former every(?) time. > > Thanks > Emil > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h
On 9 September 2016 at 15:26, Kyle Brenneman wrote: > Would it be better to use the new upstream version of eglext.h and add the > #includes, or to keep Mesa's existing eglext.h and add the missing > declarations for EGL_KHR_debug? > Afaict we've been doing the former every(?) time. Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h
Would it be better to use the new upstream version of eglext.h and add the #includes, or to keep Mesa's existing eglext.h and add the missing declarations for EGL_KHR_debug? -Kyle On 09/09/2016 03:31 AM, Emil Velikov wrote: On 8 September 2016 at 18:46, Adam Jackson wrote: From: Kyle Brenneman Updated eglext.h to revision 32074 from the Khronos repository. Added two #includes to egltypedefs.h. Both were in the previous version of eglext.h but not in the new one. -#include -#include - AFAICT neither of these was in the upstream eglext.h, ever. Then again we must upstreaming/standardise the remaining extensions, since removing this hunk will break applications. Most/all companies working on mesa are members of Khronos so it shouldn't be that hard to get things sorted :-) NACK on this hunk - please keep it as-is for the time being. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h
On 8 September 2016 at 18:46, Adam Jackson wrote: > From: Kyle Brenneman > > Updated eglext.h to revision 32074 from the Khronos repository. > > Added two #includes to egltypedefs.h. Both were in the previous version > of eglext.h but not in the new one. > -#include > -#include > - AFAICT neither of these was in the upstream eglext.h, ever. Then again we must upstreaming/standardise the remaining extensions, since removing this hunk will break applications. Most/all companies working on mesa are members of Khronos so it shouldn't be that hard to get things sorted :-) NACK on this hunk - please keep it as-is for the time being. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/7] EGL: Update eglext.h
From: Kyle Brenneman
Updated eglext.h to revision 32074 from the Khronos repository.
Added two #includes to egltypedefs.h. Both were in the previous version
of eglext.h but not in the new one.
Reviewed-by: Adam Jackson
---
include/EGL/eglext.h | 36 ++--
src/egl/main/egltypedefs.h | 2 ++
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index 6043b37..40a2233 100644
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -6,7 +6,7 @@ extern "C" {
#endif
/*
-** Copyright (c) 2013-2014 The Khronos Group Inc.
+** Copyright (c) 2013-2015 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
@@ -33,12 +33,12 @@ extern "C" {
** used to make the header, and the header can be found at
** http://www.opengl.org/registry/
**
-** Khronos $Revision$ on $Date$
+** Khronos $Revision: 32074 $ on $Date: 2015-09-30 10:36:02 -0700 (Wed, 30 Sep
2015) $
*/
#include
-#define EGL_EGLEXT_VERSION 20150508
+#define EGL_EGLEXT_VERSION 20150930
/* Generated C header for:
* API: egl
@@ -99,6 +99,33 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay
dpy, EGLenum type,
#define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3
#endif /* EGL_KHR_create_context_no_error */
+#ifndef EGL_KHR_debug
+#define EGL_KHR_debug 1
+typedef void *EGLLabelKHR;
+typedef void *EGLObjectKHR;
+typedef void (EGLAPIENTRY *EGLDEBUGPROCKHR)(EGLenum error,const char
*command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR
objectLabel,const char* message);
+#define EGL_OBJECT_THREAD_KHR 0x33B0
+#define EGL_OBJECT_DISPLAY_KHR0x33B1
+#define EGL_OBJECT_CONTEXT_KHR0x33B2
+#define EGL_OBJECT_SURFACE_KHR0x33B3
+#define EGL_OBJECT_IMAGE_KHR 0x33B4
+#define EGL_OBJECT_SYNC_KHR 0x33B5
+#define EGL_OBJECT_STREAM_KHR 0x33B6
+#define EGL_DEBUG_MSG_CRITICAL_KHR0x33B9
+#define EGL_DEBUG_MSG_ERROR_KHR 0x33BA
+#define EGL_DEBUG_MSG_WARN_KHR0x33BB
+#define EGL_DEBUG_MSG_INFO_KHR0x33BC
+#define EGL_DEBUG_CALLBACK_KHR0x33B8
+typedef EGLint (EGLAPIENTRYP PFNEGLDEBUGMESSAGECONTROLKHRPROC)
(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEBUGKHRPROC) (EGLint attribute,
EGLAttrib *value);
+typedef EGLint (EGLAPIENTRYP PFNEGLLABELOBJECTKHRPROC) (EGLDisplay display,
EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLint EGLAPIENTRY eglDebugMessageControlKHR (EGLDEBUGPROCKHR callback,
const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDebugKHR (EGLint attribute, EGLAttrib
*value);
+EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum
objectType, EGLObjectKHR object, EGLLabelKHR label);
+#endif
+#endif /* EGL_KHR_debug */
+
#ifndef EGL_KHR_fence_sync
#define EGL_KHR_fence_sync 1
typedef khronos_utime_nanoseconds_t EGLTimeKHR;
@@ -879,9 +906,6 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
#define EGL_NATIVE_SURFACE_TIZEN 0x32A1
#endif /* EGL_TIZEN_image_native_surface */
-#include
-#include
-
#ifdef __cplusplus
}
#endif
diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 7facdb4..f20af44 100644
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -33,6 +33,8 @@
#include
#include
+#include
+#include
#include "eglcompiler.h"
--
2.9.3
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
