diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 21:08:15 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 21:08:15 +0000 |
| commit | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (patch) | |
| tree | 10b8d598d3c821cdb25569d4bd750b7ad8cae269 /xorg-server/render/picture.c | |
| parent | d34fc70fab4607f70184206a592397c97c3e478e (diff) | |
| download | vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.gz vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.tar.bz2 vcxsrv-d8432fdd4f13e9f9d1d44f5482faeb56562661a9.zip | |
Switched to xorg-server-1.7.99.2
Diffstat (limited to 'xorg-server/render/picture.c')
| -rw-r--r-- | xorg-server/render/picture.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c index e1a297203..18bfea29b 100644 --- a/xorg-server/render/picture.c +++ b/xorg-server/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) { |