Skip to content

Xv: make creation of resource types independent from serverGeneration #1460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Xv: make creation of resource types independent from serverGeneration #1460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Xext/xvmain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ SOFTWARE.

#include <dix-config.h>

#include <stdbool.h>
#include <string.h>
#include <X11/X.h>
#include <X11/Xproto.h>
Expand Down Expand Up @@ -120,7 +121,6 @@ Bool noXvExtension = FALSE;

static x_server_generation_t XvExtensionGeneration = 0;
static x_server_generation_t XvScreenGeneration = 0;
static x_server_generation_t XvResourceGeneration = 0;

int XvReqCode;
static int XvEventBase;
Expand Down Expand Up @@ -203,15 +203,15 @@ XvExtensionInit(void)
}
}

static bool resources_initialized = false;

/* can be called from different angles */
static Bool
CreateResourceTypes(void)
{

if (XvResourceGeneration == serverGeneration)
if (resources_initialized)
return TRUE;

XvResourceGeneration = serverGeneration;

if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort, "XvRTPort"))) {
ErrorF("CreateResourceTypes: failed to allocate port resource.\n");
return FALSE;
Expand Down Expand Up @@ -252,7 +252,6 @@ CreateResourceTypes(void)
}

return TRUE;

}

static void XvWindowDestroy(CallbackListPtr *pcbl, ScreenPtr pScreen, WindowPtr pWin)
Expand Down