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

glx/dri2: Stop tracking the protocol version in the display state

Browse Source 
We only use it at init time, no need to keep it around.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17422>
This commit is contained in:
Adam Jackson
2022-07-06 10:22:39 -04:00
committed by Marge Bot
parent 1255d370b7
commit 11c30fcad0
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/glx/dri2_glx.c
View File

@@ -63,13 +63,6 @@ struct dri2_display
{
__GLXDRIdisplay base;
/*
** XFree86-DRI version information
*/
int driMajor;
int driMinor;
int driPatch;
__glxHashTable *dri2Hash;
const __DRIextension *loader_extensions[5];
@@ -1321,6 +1314,7 @@ dri2CreateDisplay(Display * dpy)
{
struct dri2_display *pdp;
int eventBase, errorBase, i;
int driMajor, driMinor;
if (!DRI2QueryExtension(dpy, &eventBase, &errorBase))
return NULL;
@@ -1329,18 +1323,12 @@ dri2CreateDisplay(Display * dpy)
if (pdp == NULL)
return NULL;
if (!DRI2QueryVersion(dpy, &pdp->driMajor, &pdp->driMinor)) {
if (!DRI2QueryVersion(dpy, &driMajor, &driMinor) ||
driMinor < 3) {
free(pdp);
return NULL;
}
if (pdp->driMinor < 3) {
free(pdp);
return NULL;
}
pdp->driPatch = 0;
pdp->base.destroyDisplay = dri2DestroyDisplay;
pdp->base.createScreen = dri2CreateScreen;