← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to afb/afbcmap.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
afb/afbcmap.c
39
39
#include "colormapst.h"
40
40
#include "resource.h"
41
41
#include "micmap.h"
 
42
#include "afb.h"
42
43
 
43
44
int
44
 
afbListInstalledColormaps(pScreen, pmaps)
45
 
        ScreenPtr               pScreen;
46
 
        Colormap                *pmaps;
 
45
afbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
47
46
{
48
47
        return miListInstalledColormaps(pScreen, pmaps);
49
48
}
50
49
 
51
50
 
52
51
void
53
 
afbInstallColormap(pmap)
54
 
        ColormapPtr             pmap;
 
52
afbInstallColormap(ColormapPtr pmap)
55
53
{
56
54
        miInstallColormap(pmap);
57
55
}
58
56
 
59
57
void
60
 
afbUninstallColormap(pmap)
61
 
        ColormapPtr             pmap;
 
58
afbUninstallColormap(ColormapPtr pmap)
62
59
{
63
60
        miUninstallColormap(pmap);
64
61
}
65
62
 
66
63
void
67
 
afbResolveColor(pred, pgreen, pblue, pVisual)
68
 
        unsigned short          *pred, *pgreen, *pblue;
69
 
        register VisualPtr              pVisual;
 
64
afbResolveColor(short unsigned int *pred, short unsigned int *pgreen, short unsigned int *pblue, register VisualPtr pVisual)
70
65
{
71
66
        miResolveColor(pred, pgreen, pblue, pVisual);
72
67
}
73
68
 
74
69
Bool
75
 
afbInitializeColormap(pmap)
76
 
        register ColormapPtr            pmap;
 
70
afbInitializeColormap(register ColormapPtr pmap)
77
71
{
78
72
        return miInitializeColormap(pmap);
79
73
}
80
74
 
81
75
int
82
 
afbExpandDirectColors(pmap, ndef, indefs, outdefs)
83
 
        ColormapPtr             pmap;
84
 
        int                             ndef;
85
 
        xColorItem              *indefs, *outdefs;
 
76
afbExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, xColorItem *outdefs)
86
77
{
87
78
        return miExpandDirectColors(pmap, ndef, indefs, outdefs);
88
79
}
89
80
 
90
81
Bool
91
 
afbCreateDefColormap(pScreen)
92
 
        ScreenPtr pScreen;
 
82
afbCreateDefColormap(ScreenPtr pScreen)
93
83
{
94
84
        return miCreateDefColormap(pScreen);
95
85
}
96
86
 
97
87
Bool
98
 
afbSetVisualTypes(depth, visuals, bitsPerRGB)
99
 
        int depth;
100
 
        int visuals;
101
 
        int bitsPerRGB;
 
88
afbSetVisualTypes(int depth, int visuals, int bitsPerRGB)
102
89
{
103
90
        return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
104
91
}
110
97
 */
111
98
 
112
99
Bool
113
 
afbInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp, defaultVisp,
114
 
                                         sizes, bitsPerRGB)
115
 
        VisualPtr *visualp;
116
 
        DepthPtr *depthp;
117
 
        int *nvisualp, *ndepthp;
118
 
        int *rootDepthp;
119
 
        VisualID *defaultVisp;
120
 
        unsigned long sizes;
121
 
        int bitsPerRGB;
 
100
afbInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp, long unsigned int sizes, int bitsPerRGB)
122
101
{
123
102
        return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp,
124
103
                                defaultVisp, sizes, bitsPerRGB, -1);