[render] Split out filter finding from filter setting.

 Backported from X.org:

 commit acda790e430b2a18c7c35379f6e538f3d01ff221
 Author: Keith Packard <keithp@keithp.com>
 Date:   Fri Mar 14 13:46:30 2008 -0700

    [render] Split out filter finding from filter setting.

    To prepare for RandR using filters in transforms, split out
    code paths so that the RandR code can validate the filter name and
    parameters during the transform set operation so that use of the filter
    later will not have unreportable errors.

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

1 files changed, 38 insertions, 13 deletions

diff --git a/nx-X11/programs/Xserver/render/filter.c b/nx-X11/programs/Xserver/render/filter.c
index 776bd4237..57a21a8c0 100644
--- a/nx-X11/programs/Xserver/render/filter.c
+++ b/nx-X11/programs/Xserver/render/filter.c
@@ -215,21 +215,30 @@ PictureFindFilter (ScreenPtr pScreen, char *name, int len)
 }
 
 static Bool
-convolutionFilterValidateParams (PicturePtr pPicture,
+convolutionFilterValidateParams (ScreenPtr pScreen,
                                  int	   filter,
                                  xFixed	   *params,
-                                 int	   nparams)
+                                 int	   nparams,
+                                 int*      width,
+                                 int*      height)
 {
+    int w, h;
+
     if (nparams < 3)
         return FALSE;
 
     if (xFixedFrac (params[0]) || xFixedFrac (params[1]))
         return FALSE;
 
+    w = xFixedToInt (params[0]);
+    h = xFixedToInt (params[1]);
+
     nparams -= 2;
-    if ((xFixedToInt (params[0]) * xFixedToInt (params[1])) > nparams)
+    if (w * h > nparams)
         return FALSE;
 
+    *width = w;
+    *height = h;
     return TRUE;
 }
 
@@ -271,10 +280,8 @@ PictureResetFilters (ScreenPtr pScreen)
 int
 SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int nparams)
 {
-    ScreenPtr     pScreen;
     PictFilterPtr pFilter;
-    xFixed        *new_params;
-    int           i;
+    ScreenPtr     pScreen;
 
     if (pPicture->pDrawable) {
         pScreen = pPicture->pDrawable->pScreen;
@@ -288,7 +295,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
     if (!pFilter)
         return BadName;
 
-    if (!pPicture->pDrawable) {
+    if (pPicture->pDrawable == NULL) {
         int s;
 
         /* For source pictures, the picture isn't tied to a screen.  So, ensure
@@ -303,8 +310,25 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
         }
     }
 
+    return SetPicturePictFilter (pPicture, pFilter, params, nparams);
+}
+
+int
+SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter,
+                     xFixed *params, int nparams)
+{
+    ScreenPtr  pScreen;
+    int                i;
+
+    if (pPicture->pDrawable)
+       pScreen = pPicture->pDrawable->pScreen;
+    else
+       pScreen = screenInfo.screens[0];
+
     if (pFilter->ValidateParams) {
-        if (!(*pFilter->ValidateParams) (pPicture, pFilter->id, params, nparams))
+        int width, height;
+
+        if (!(*pFilter->ValidateParams) (pScreen, pFilter->id, params, nparams, &width, &height))
           return BadMatch;
     }
     else if (nparams) {
@@ -312,7 +336,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
     }
 
     if (nparams != pPicture->filter_nparams) {
-        new_params = xalloc (nparams * sizeof (xFixed));
+        xFixed *new_params = xalloc (nparams * sizeof (xFixed));
 
         if (!new_params && nparams)
             return BadAlloc;
@@ -324,9 +348,10 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
         pPicture->filter_params[i] = params[i];
     pPicture->filter = pFilter->id;
 
-    if (pPicture->pDrawable) {
-        PictureScreenPtr ps = GetPictureScreen (pScreen);
-        int result;
+    if (pPicture->pDrawable)
+    {
+        PictureScreenPtr    ps = GetPictureScreen(pScreen);
+        int                 result;
 
         result = (*ps->ChangePictureFilter) (pPicture, pPicture->filter,
                                              params, nparams);
@@ -335,5 +360,5 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
     }
     pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;
 
-    return Success;
+    return ;
 }