summaryrefslogtreecommitdiff
path: root/render/picture.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-12-02 17:43:01 -0800
committerKeith Packard <keithp@keithp.com>2009-12-18 17:44:12 -0800
commit895f40792a14d8b88923bf3b428d31ae3bb31e46 (patch)
tree3f53eecbf3ffea314ee657a0254925fe65510605 /render/picture.c
parenta11c58fa0c5809f918b36b84be53385cb2d8ea59 (diff)
Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument Breaks DIX ABI. ABI versions bumped: Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'render/picture.c')
-rw-r--r--render/picture.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/render/picture.c b/render/picture.c
index e1a297203..18bfea29b 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -41,7 +41,6 @@
#include "servermd.h"
#include "picturestr.h"
#include "xace.h"
-#include "registry.h"
static int PictureScreenPrivateKeyIndex;
DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex;
@@ -618,19 +617,16 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
if (PictureGeneration != serverGeneration)
{
- PictureType = CreateNewResourceType (FreePicture);
+ PictureType = CreateNewResourceType (FreePicture, "PICTURE");
if (!PictureType)
return FALSE;
- PictFormatType = CreateNewResourceType (FreePictFormat);
+ PictFormatType = CreateNewResourceType (FreePictFormat, "PICTFORMAT");
if (!PictFormatType)
return FALSE;
- GlyphSetType = CreateNewResourceType (FreeGlyphSet);
+ GlyphSetType = CreateNewResourceType (FreeGlyphSet, "GLYPHSET");
if (!GlyphSetType)
return FALSE;
PictureGeneration = serverGeneration;
- RegisterResourceName (PictureType, "PICTURE");
- RegisterResourceName (PictFormatType, "PICTFORMAT");
- RegisterResourceName (GlyphSetType, "GLYPHSET");
}
if (!formats)
{