OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Fix and simplify the share context compatibility check

Browse Source 
We only end up with one DRI provider per screen, so the only way the
context vtable can differ is if they're not the same directness. Rewrite
the test in those terms to help us unify some of this code away in the
future. Also apply the same logic to the indirect context creation path.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12456>
This commit is contained in:
Adam Jackson
2021-08-06 17:10:45 -04:00
committed by Marge Bot
parent 5c71bf065f
commit 145992890c
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/glx/dri2_glx.c
View File

@@ -221,12 +221,9 @@ dri2_create_context_attribs(struct glx_screen *base,
goto error_exit; goto error_exit;
if (shareList) { if (shareList) {
/* If the shareList context is not a DRI2 context, we cannot possibly /* We can't share with an indirect context */
* create a DRI2 context that shares it. if (!shareList->isDirect)
*/
if (shareList->vtable->destroy != dri2_destroy_context) {
return NULL; return NULL;
}
pcp_shared = (struct dri2_context *) shareList; pcp_shared = (struct dri2_context *) shareList;
shared = pcp_shared->driContext; shared = pcp_shared->driContext;

7
src/glx/dri3_glx.c
View File

@@ -268,12 +268,9 @@ dri3_create_context_attribs(struct glx_screen *base,
goto error_exit; goto error_exit;
if (shareList) { if (shareList) {
/* If the shareList context is not a DRI3 context, we cannot possibly /* We can't share with an indirect context */
* create a DRI3 context that shares it. if (!shareList->isDirect)
*/
if (shareList->vtable->destroy != dri3_destroy_context) {
return NULL; return NULL;
}
pcp_shared = (struct dri3_context *) shareList; pcp_shared = (struct dri3_context *) shareList;
shared = pcp_shared->driContext; shared = pcp_shared->driContext;

7
src/glx/drisw_glx.c
View File

@@ -548,12 +548,9 @@ drisw_create_context_attribs(struct glx_screen *base,
return NULL; return NULL;
if (shareList) { if (shareList) {
/* If the shareList context is not a DRISW context, we cannot possibly /* We can't share with an indirect context */
* create a DRISW context that shares it. if (!shareList->isDirect)
*/
if (shareList->vtable->destroy != drisw_destroy_context) {
return NULL; return NULL;
}
pcp_shared = (struct drisw_context *) shareList; pcp_shared = (struct drisw_context *) shareList;
shared = pcp_shared->driContext; shared = pcp_shared->driContext;

8
src/glx/indirect_glx.c
View File

@@ -253,10 +253,6 @@ indirect_create_context(struct glx_screen *psc,
* \todo Eliminate \c __glXInitVertexArrayState. Replace it with a new * \todo Eliminate \c __glXInitVertexArrayState. Replace it with a new
* function called \c __glXAllocateClientState that allocates the memory and * function called \c __glXAllocateClientState that allocates the memory and
* does all the initialization (including the pixel pack / unpack). * does all the initialization (including the pixel pack / unpack).
*
* \note
* This function is \b not the place to validate the context creation
* parameters. It is just the allocator for the \c glx_context.
*/ */
_X_HIDDEN struct glx_context * _X_HIDDEN struct glx_context *
indirect_create_context_attribs(struct glx_screen *psc, indirect_create_context_attribs(struct glx_screen *psc,
@@ -302,6 +298,10 @@ indirect_create_context_attribs(struct glx_screen *psc,
return NULL; return NULL;
} }
/* We can't share with a direct context */
if (shareList && shareList->isDirect)
return NULL;
/* Allocate our context record */ /* Allocate our context record */
gc = calloc(1, sizeof *gc); gc = calloc(1, sizeof *gc);
if (!gc) { if (!gc) {