[mesa3d] Sync all patch files with DDK 1.17.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
From 7c21f010de28888376dcafd99d3fa43d15279dc6 Mon Sep 17 00:00:00 2001
|
||||
From 1e6466e541e1fc67198be3eeb090e3af22bd6d19 Mon Sep 17 00:00:00 2001
|
||||
From: Brendan King <Brendan.King@imgtec.com>
|
||||
Date: Mon, 10 Feb 2020 09:23:03 +0000
|
||||
Subject: [PATCH 44/50] egl: query the supported ES2 context version
|
||||
Subject: [PATCH 43/67] egl: query the supported ES2 context version
|
||||
|
||||
For OpenGL ES contexts, the EGL specification states that querying
|
||||
EGL_CONTEXT_CLIENT_VERSION with eglQueryContext may return a version
|
||||
@@ -39,10 +39,10 @@ large value it currently has.
|
||||
7 files changed, 50 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
|
||||
index 8214e7a55c3..302e4e08de0 100644
|
||||
index 6490f6e80e2..9c7bcac4cae 100644
|
||||
--- a/include/GL/internal/dri_interface.h
|
||||
+++ b/include/GL/internal/dri_interface.h
|
||||
@@ -2028,6 +2028,8 @@ typedef struct __DRIDriverVtableExtensionRec {
|
||||
@@ -2052,6 +2052,8 @@ typedef struct __DRIDriverVtableExtensionRec {
|
||||
|
||||
#define __DRI2_RENDERER_HAS_PROTECTED_CONTENT 0x000e
|
||||
|
||||
@@ -52,10 +52,10 @@ index 8214e7a55c3..302e4e08de0 100644
|
||||
struct __DRI2rendererQueryExtensionRec {
|
||||
__DRIextension base;
|
||||
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
|
||||
index f001ee7b98f..cda414f4adc 100644
|
||||
index 6b26ff979ae..c4a49cae592 100644
|
||||
--- a/src/egl/drivers/dri2/egl_dri2.c
|
||||
+++ b/src/egl/drivers/dri2/egl_dri2.c
|
||||
@@ -2083,6 +2083,26 @@ dri2_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
|
||||
@@ -2055,6 +2055,26 @@ dri2_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
|
||||
return EGL_TRUE;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ index f001ee7b98f..cda414f4adc 100644
|
||||
__DRIdrawable *
|
||||
dri2_surface_get_dri_drawable(_EGLSurface *surf)
|
||||
{
|
||||
@@ -4347,6 +4367,7 @@ const _EGLDriver _eglDriver = {
|
||||
@@ -4336,6 +4356,7 @@ const _EGLDriver _eglDriver = {
|
||||
.CreateContext = dri2_create_context,
|
||||
.DestroyContext = dri2_destroy_context,
|
||||
.MakeCurrent = dri2_make_current,
|
||||
@@ -91,7 +91,7 @@ index f001ee7b98f..cda414f4adc 100644
|
||||
.CreatePixmapSurface = dri2_create_pixmap_surface,
|
||||
.CreatePbufferSurface = dri2_create_pbuffer_surface,
|
||||
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
index 8eda31c2936..6fc58371063 100644
|
||||
index 18c73c9cd8b..2690a82eb75 100644
|
||||
--- a/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
|
||||
@@ -297,6 +297,14 @@ haiku_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
|
||||
@@ -118,7 +118,7 @@ index 8eda31c2936..6fc58371063 100644
|
||||
.CreatePixmapSurface = haiku_create_pixmap_surface,
|
||||
.CreatePbufferSurface = haiku_create_pbuffer_surface,
|
||||
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
|
||||
index 431dd70d1d8..900ef7ab4cc 100644
|
||||
index 2d3931dfd26..1cbff9656e4 100644
|
||||
--- a/src/egl/main/eglapi.c
|
||||
+++ b/src/egl/main/eglapi.c
|
||||
@@ -948,7 +948,7 @@ eglQueryContext(EGLDisplay dpy, EGLContext ctx,
|
||||
@@ -131,7 +131,7 @@ index 431dd70d1d8..900ef7ab4cc 100644
|
||||
RETURN_EGL_EVAL(disp, ret);
|
||||
}
|
||||
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
|
||||
index 65dc886abbb..09e7d3ee589 100644
|
||||
index 15de7c99496..7274d246194 100644
|
||||
--- a/src/egl/main/eglcontext.c
|
||||
+++ b/src/egl/main/eglcontext.c
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -199,5 +199,5 @@ index 12f9a0aab86..92af8bd16d5 100644
|
||||
/* surface funcs */
|
||||
_EGLSurface *(*CreateWindowSurface)(_EGLDisplay *disp, _EGLConfig *config,
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user