2003-11-14 17:48:57 +01:00
|
|
|
/*
|
2004-12-04 01:43:13 +01:00
|
|
|
* Copyright © 2002 Keith Packard
|
2003-11-14 17:48:57 +01:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that
|
|
|
|
* copyright notice and this permission notice appear in supporting
|
|
|
|
* documentation, and that the name of Keith Packard not be used in
|
|
|
|
* advertising or publicity pertaining to distribution of the software without
|
|
|
|
* specific, written prior permission. Keith Packard makes no
|
|
|
|
* representations about the suitability of this software for any purpose. It
|
|
|
|
* is provided "as is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
|
|
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2005-07-03 10:53:54 +02:00
|
|
|
#include "misc.h"
|
2003-11-14 17:48:57 +01:00
|
|
|
#include "scrnintstr.h"
|
2005-07-03 10:53:54 +02:00
|
|
|
#include "os.h"
|
2003-11-14 17:48:57 +01:00
|
|
|
#include "regionstr.h"
|
|
|
|
#include "validate.h"
|
|
|
|
#include "windowstr.h"
|
|
|
|
#include "input.h"
|
|
|
|
#include "resource.h"
|
|
|
|
#include "colormapst.h"
|
|
|
|
#include "cursorstr.h"
|
|
|
|
#include "dixstruct.h"
|
|
|
|
#include "gcstruct.h"
|
|
|
|
#include "servermd.h"
|
|
|
|
#include "picturestr.h"
|
|
|
|
|
|
|
|
static char **filterNames;
|
2012-03-21 20:55:09 +01:00
|
|
|
static int nfilterNames;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2004-07-29 20:37:54 +02:00
|
|
|
/*
|
|
|
|
* standard but not required filters don't have constant indices
|
|
|
|
*/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureGetFilterId(const char *filter, int len, Bool makeit)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
|
|
|
char *name;
|
|
|
|
char **names;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
if (len < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
len = strlen(filter);
|
2003-11-14 17:48:57 +01:00
|
|
|
for (i = 0; i < nfilterNames; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!CompareISOLatin1Lowered((const unsigned char *) filterNames[i], -1,
|
|
|
|
(const unsigned char *) filter, len))
|
|
|
|
return i;
|
2003-11-14 17:48:57 +01:00
|
|
|
if (!makeit)
|
2012-03-21 20:55:09 +01:00
|
|
|
return -1;
|
2010-05-05 20:44:06 +02:00
|
|
|
name = malloc(len + 1);
|
2003-11-14 17:48:57 +01:00
|
|
|
if (!name)
|
2012-03-21 20:55:09 +01:00
|
|
|
return -1;
|
|
|
|
memcpy(name, filter, len);
|
2003-11-14 17:48:57 +01:00
|
|
|
name[len] = '\0';
|
|
|
|
if (filterNames)
|
2015-03-21 21:42:12 +01:00
|
|
|
names = reallocarray(filterNames, nfilterNames + 1, sizeof(char *));
|
2003-11-14 17:48:57 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
names = malloc(sizeof(char *));
|
|
|
|
if (!names) {
|
|
|
|
free(name);
|
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
filterNames = names;
|
|
|
|
i = nfilterNames++;
|
|
|
|
filterNames[i] = name;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureSetDefaultIds(void)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
/* careful here -- this list must match the #define values */
|
2005-06-13 16:40:25 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (PictureGetFilterId(FilterNearest, -1, TRUE) != PictFilterNearest)
|
|
|
|
return FALSE;
|
|
|
|
if (PictureGetFilterId(FilterBilinear, -1, TRUE) != PictFilterBilinear)
|
|
|
|
return FALSE;
|
2005-06-13 16:40:25 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (PictureGetFilterId(FilterFast, -1, TRUE) != PictFilterFast)
|
|
|
|
return FALSE;
|
|
|
|
if (PictureGetFilterId(FilterGood, -1, TRUE) != PictFilterGood)
|
|
|
|
return FALSE;
|
|
|
|
if (PictureGetFilterId(FilterBest, -1, TRUE) != PictFilterBest)
|
|
|
|
return FALSE;
|
2005-06-13 16:40:25 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (PictureGetFilterId(FilterConvolution, -1, TRUE) !=
|
|
|
|
PictFilterConvolution)
|
|
|
|
return FALSE;
|
2003-11-14 17:48:57 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
char *
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureGetFilterName(int id)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
if (0 <= id && id < nfilterNames)
|
2012-03-21 20:55:09 +01:00
|
|
|
return filterNames[id];
|
2003-11-14 17:48:57 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
return 0;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureFreeFilterIds(void)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
for (i = 0; i < nfilterNames; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
free(filterNames[i]);
|
2010-05-05 20:44:06 +02:00
|
|
|
free(filterNames);
|
2003-11-14 17:48:57 +01:00
|
|
|
nfilterNames = 0;
|
|
|
|
filterNames = 0;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureAddFilter(ScreenPtr pScreen,
|
|
|
|
const char *filter,
|
|
|
|
PictFilterValidateParamsProcPtr ValidateParams,
|
|
|
|
int width, int height)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
int id = PictureGetFilterId(filter, -1, TRUE);
|
|
|
|
int i;
|
|
|
|
PictFilterPtr filters;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
if (id < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
* It's an error to attempt to reregister a filter
|
|
|
|
*/
|
|
|
|
for (i = 0; i < ps->nfilters; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ps->filters[i].id == id)
|
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
if (ps->filters)
|
2012-03-21 20:55:09 +01:00
|
|
|
filters =
|
2015-03-21 21:42:12 +01:00
|
|
|
reallocarray(ps->filters, ps->nfilters + 1, sizeof(PictFilterRec));
|
2003-11-14 17:48:57 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
filters = malloc(sizeof(PictFilterRec));
|
2003-11-14 17:48:57 +01:00
|
|
|
if (!filters)
|
2012-03-21 20:55:09 +01:00
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
ps->filters = filters;
|
|
|
|
i = ps->nfilters++;
|
2012-03-21 20:55:09 +01:00
|
|
|
ps->filters[i].name = PictureGetFilterName(id);
|
2003-11-14 17:48:57 +01:00
|
|
|
ps->filters[i].id = id;
|
2004-07-29 20:37:54 +02:00
|
|
|
ps->filters[i].ValidateParams = ValidateParams;
|
2008-03-17 23:19:17 +01:00
|
|
|
ps->filters[i].width = width;
|
|
|
|
ps->filters[i].height = height;
|
2003-11-14 17:48:57 +01:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureSetFilterAlias(ScreenPtr pScreen, const char *filter, const char *alias)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
int filter_id = PictureGetFilterId(filter, -1, FALSE);
|
|
|
|
int alias_id = PictureGetFilterId(alias, -1, TRUE);
|
|
|
|
int i;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
if (filter_id < 0 || alias_id < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
return FALSE;
|
2003-11-14 17:48:57 +01:00
|
|
|
for (i = 0; i < ps->nfilterAliases; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ps->filterAliases[i].alias_id == alias_id)
|
|
|
|
break;
|
|
|
|
if (i == ps->nfilterAliases) {
|
|
|
|
PictFilterAliasPtr aliases;
|
|
|
|
|
|
|
|
if (ps->filterAliases)
|
2015-03-21 21:42:12 +01:00
|
|
|
aliases = reallocarray(ps->filterAliases,
|
|
|
|
ps->nfilterAliases + 1,
|
|
|
|
sizeof(PictFilterAliasRec));
|
2012-03-21 20:55:09 +01:00
|
|
|
else
|
|
|
|
aliases = malloc(sizeof(PictFilterAliasRec));
|
|
|
|
if (!aliases)
|
|
|
|
return FALSE;
|
|
|
|
ps->filterAliases = aliases;
|
|
|
|
ps->filterAliases[i].alias = PictureGetFilterName(alias_id);
|
|
|
|
ps->filterAliases[i].alias_id = alias_id;
|
|
|
|
ps->nfilterAliases++;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
ps->filterAliases[i].filter_id = filter_id;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
PictFilterPtr
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureFindFilter(ScreenPtr pScreen, char *name, int len)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
int id = PictureGetFilterId(name, len, FALSE);
|
|
|
|
int i;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
if (id < 0)
|
2012-03-21 20:55:09 +01:00
|
|
|
return 0;
|
2003-11-14 17:48:57 +01:00
|
|
|
/* Check for an alias, allow them to recurse */
|
|
|
|
for (i = 0; i < ps->nfilterAliases; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ps->filterAliases[i].alias_id == id) {
|
|
|
|
id = ps->filterAliases[i].filter_id;
|
|
|
|
i = 0;
|
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
/* find the filter */
|
|
|
|
for (i = 0; i < ps->nfilters; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ps->filters[i].id == id)
|
|
|
|
return &ps->filters[i];
|
2003-11-14 17:48:57 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-13 16:40:25 +02:00
|
|
|
static Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
convolutionFilterValidateParams(ScreenPtr pScreen,
|
|
|
|
int filter,
|
|
|
|
xFixed * params,
|
|
|
|
int nparams, int *width, int *height)
|
2005-06-13 16:40:25 +02:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int w, h;
|
|
|
|
|
2005-06-13 16:40:25 +02:00
|
|
|
if (nparams < 3)
|
|
|
|
return FALSE;
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (xFixedFrac(params[0]) || xFixedFrac(params[1]))
|
2005-06-13 16:40:25 +02:00
|
|
|
return FALSE;
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
w = xFixedToInt(params[0]);
|
|
|
|
h = xFixedToInt(params[1]);
|
2008-03-17 23:19:17 +01:00
|
|
|
|
2005-06-13 16:40:25 +02:00
|
|
|
nparams -= 2;
|
2008-03-17 23:19:17 +01:00
|
|
|
if (w * h > nparams)
|
2005-06-13 16:40:25 +02:00
|
|
|
return FALSE;
|
|
|
|
|
2008-03-17 23:19:17 +01:00
|
|
|
*width = w;
|
|
|
|
*height = h;
|
2005-06-13 16:40:25 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureSetDefaultFilters(ScreenPtr pScreen)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
if (!filterNames)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!PictureSetDefaultIds())
|
|
|
|
return FALSE;
|
|
|
|
if (PictureAddFilter(pScreen, FilterNearest, 0, 1, 1) < 0)
|
|
|
|
return FALSE;
|
|
|
|
if (PictureAddFilter(pScreen, FilterBilinear, 0, 2, 2) < 0)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!PictureSetFilterAlias(pScreen, FilterNearest, FilterFast))
|
|
|
|
return FALSE;
|
|
|
|
if (!PictureSetFilterAlias(pScreen, FilterBilinear, FilterGood))
|
|
|
|
return FALSE;
|
|
|
|
if (!PictureSetFilterAlias(pScreen, FilterBilinear, FilterBest))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (PictureAddFilter
|
|
|
|
(pScreen, FilterConvolution, convolutionFilterValidateParams, 0, 0) < 0)
|
2005-06-13 16:40:25 +02:00
|
|
|
return FALSE;
|
|
|
|
|
2003-11-14 17:48:57 +01:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureResetFilters(ScreenPtr pScreen)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
free(ps->filters);
|
|
|
|
free(ps->filterAliases);
|
2012-08-08 02:49:46 +02:00
|
|
|
|
|
|
|
/* Free the filters when the last screen is closed */
|
|
|
|
if (pScreen->myNum == 0)
|
|
|
|
PictureFreeFilterIds();
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
SetPictureFilter(PicturePtr pPicture, char *name, int len, xFixed * params,
|
|
|
|
int nparams)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
PictFilterPtr pFilter;
|
|
|
|
ScreenPtr pScreen;
|
2006-06-30 12:03:47 +02:00
|
|
|
|
2008-03-14 21:46:30 +01:00
|
|
|
if (pPicture->pDrawable != NULL)
|
2012-03-21 20:55:09 +01:00
|
|
|
pScreen = pPicture->pDrawable->pScreen;
|
2008-03-14 21:46:30 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
pScreen = screenInfo.screens[0];
|
2008-03-14 21:46:30 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
pFilter = PictureFindFilter(pScreen, name, len);
|
2008-03-14 21:46:30 +01:00
|
|
|
|
|
|
|
if (!pFilter)
|
2012-03-21 20:55:09 +01:00
|
|
|
return BadName;
|
|
|
|
|
|
|
|
if (pPicture->pDrawable == NULL) {
|
|
|
|
int s;
|
|
|
|
|
|
|
|
/* For source pictures, the picture isn't tied to a screen. So, ensure
|
|
|
|
* that all screens can handle a filter we set for the picture.
|
|
|
|
*/
|
|
|
|
for (s = 1; s < screenInfo.numScreens; s++) {
|
|
|
|
PictFilterPtr pScreenFilter;
|
|
|
|
|
|
|
|
pScreenFilter = PictureFindFilter(screenInfo.screens[s], name, len);
|
|
|
|
if (!pScreenFilter || pScreenFilter->id != pFilter->id)
|
|
|
|
return BadMatch;
|
|
|
|
}
|
2006-06-30 12:03:47 +02:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
return SetPicturePictFilter(pPicture, pFilter, params, nparams);
|
2008-03-14 21:46:30 +01:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
SetPicturePictFilter(PicturePtr pPicture, PictFilterPtr pFilter,
|
|
|
|
xFixed * params, int nparams)
|
2008-03-14 21:46:30 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
ScreenPtr pScreen;
|
|
|
|
int i;
|
2008-03-14 21:46:30 +01:00
|
|
|
|
|
|
|
if (pPicture->pDrawable)
|
2012-03-21 20:55:09 +01:00
|
|
|
pScreen = pPicture->pDrawable->pScreen;
|
2008-03-14 21:46:30 +01:00
|
|
|
else
|
2012-03-21 20:55:09 +01:00
|
|
|
pScreen = screenInfo.screens[0];
|
|
|
|
|
|
|
|
if (pFilter->ValidateParams) {
|
|
|
|
int width, height;
|
2003-11-14 17:48:57 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!(*pFilter->ValidateParams)
|
|
|
|
(pScreen, pFilter->id, params, nparams, &width, &height))
|
|
|
|
return BadMatch;
|
2004-07-29 20:37:54 +02:00
|
|
|
}
|
|
|
|
else if (nparams)
|
2012-03-21 20:55:09 +01:00
|
|
|
return BadMatch;
|
|
|
|
|
|
|
|
if (nparams != pPicture->filter_nparams) {
|
2015-03-21 21:42:12 +01:00
|
|
|
xFixed *new_params = xallocarray(nparams, sizeof(xFixed));
|
2012-03-21 20:55:09 +01:00
|
|
|
|
|
|
|
if (!new_params && nparams)
|
|
|
|
return BadAlloc;
|
|
|
|
free(pPicture->filter_params);
|
|
|
|
pPicture->filter_params = new_params;
|
|
|
|
pPicture->filter_nparams = nparams;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
for (i = 0; i < nparams; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
pPicture->filter_params[i] = params[i];
|
2003-11-14 17:48:57 +01:00
|
|
|
pPicture->filter = pFilter->id;
|
2005-12-28 12:48:14 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (pPicture->pDrawable) {
|
|
|
|
PictureScreenPtr ps = GetPictureScreen(pScreen);
|
|
|
|
int result;
|
2006-06-30 12:03:47 +02:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
result = (*ps->ChangePictureFilter) (pPicture, pPicture->filter,
|
|
|
|
params, nparams);
|
|
|
|
return result;
|
2006-06-30 12:03:47 +02:00
|
|
|
}
|
2003-11-14 17:48:57 +01:00
|
|
|
return Success;
|
|
|
|
}
|