dri1: Remove "buffers" from the config logic
This was only ever used from the glint driver, which has since lost its DRI support. Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
a77458486a
commit
788bfbf18a
|
@ -2211,15 +2211,11 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
|
|||
static void
|
||||
configDRI(XF86ConfDRIPtr drip)
|
||||
{
|
||||
int count = 0;
|
||||
XF86ConfBuffersPtr bufs;
|
||||
int i;
|
||||
struct group *grp;
|
||||
|
||||
xf86ConfigDRI.group = -1;
|
||||
xf86ConfigDRI.mode = 0;
|
||||
xf86ConfigDRI.bufs_count = 0;
|
||||
xf86ConfigDRI.bufs = NULL;
|
||||
|
||||
if (drip) {
|
||||
if (drip->dri_group_name) {
|
||||
|
@ -2230,24 +2226,6 @@ configDRI(XF86ConfDRIPtr drip)
|
|||
xf86ConfigDRI.group = drip->dri_group;
|
||||
}
|
||||
xf86ConfigDRI.mode = drip->dri_mode;
|
||||
for (bufs = drip->dri_buffers_lst; bufs; bufs = bufs->list.next)
|
||||
++count;
|
||||
|
||||
xf86ConfigDRI.bufs_count = count;
|
||||
xf86ConfigDRI.bufs = xnfalloc(count * sizeof(*xf86ConfigDRI.bufs));
|
||||
|
||||
for (i = 0, bufs = drip->dri_buffers_lst;
|
||||
i < count;
|
||||
i++, bufs = bufs->list.next) {
|
||||
|
||||
xf86ConfigDRI.bufs[i].count = bufs->buf_count;
|
||||
xf86ConfigDRI.bufs[i].size = bufs->buf_size;
|
||||
/* FIXME: Flags not implemented. These
|
||||
could be used, for example, to specify a
|
||||
contiguous block and/or write-combining
|
||||
cache policy. */
|
||||
xf86ConfigDRI.bufs[i].flags = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -41,58 +41,10 @@ static xf86ConfigSymTabRec DRITab[] =
|
|||
{
|
||||
{ENDSECTION, "endsection"},
|
||||
{GROUP, "group"},
|
||||
{BUFFERS, "buffers"},
|
||||
{MODE, "mode"},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
#define CLEANUP xf86freeBuffersList
|
||||
|
||||
static void
|
||||
xf86freeBuffersList (XF86ConfBuffersPtr ptr)
|
||||
{
|
||||
XF86ConfBuffersPtr prev;
|
||||
|
||||
while (ptr) {
|
||||
TestFree (ptr->buf_flags);
|
||||
TestFree (ptr->buf_comment);
|
||||
prev = ptr;
|
||||
ptr = ptr->list.next;
|
||||
free (prev);
|
||||
}
|
||||
}
|
||||
|
||||
static XF86ConfBuffersPtr
|
||||
xf86parseBuffers (void)
|
||||
{
|
||||
int token;
|
||||
parsePrologue (XF86ConfBuffersPtr, XF86ConfBuffersRec)
|
||||
|
||||
if (xf86getSubToken (&(ptr->buf_comment)) != NUMBER)
|
||||
Error ("Buffers count expected", NULL);
|
||||
ptr->buf_count = val.num;
|
||||
|
||||
if (xf86getSubToken (&(ptr->buf_comment)) != NUMBER)
|
||||
Error ("Buffers size expected", NULL);
|
||||
ptr->buf_size = val.num;
|
||||
|
||||
if ((token = xf86getSubToken (&(ptr->buf_comment))) == STRING) {
|
||||
ptr->buf_flags = val.str;
|
||||
if ((token = xf86getToken (NULL)) == COMMENT)
|
||||
ptr->buf_comment = xf86addComment(ptr->buf_comment, val.str);
|
||||
else
|
||||
xf86unGetToken(token);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("Buffers parsed\n");
|
||||
#endif
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#undef CLEANUP
|
||||
|
||||
#define CLEANUP xf86freeDRI
|
||||
|
||||
XF86ConfDRIPtr
|
||||
|
@ -121,10 +73,6 @@ xf86parseDRISection (void)
|
|||
Error (MUST_BE_OCTAL_MSG, val.num);
|
||||
ptr->dri_mode = val.num;
|
||||
break;
|
||||
case BUFFERS:
|
||||
HANDLE_LIST (dri_buffers_lst, xf86parseBuffers,
|
||||
XF86ConfBuffersPtr);
|
||||
break;
|
||||
case EOF_TOKEN:
|
||||
Error (UNEXPECTED_EOF_MSG, NULL);
|
||||
break;
|
||||
|
@ -149,8 +97,6 @@ xf86parseDRISection (void)
|
|||
void
|
||||
xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)
|
||||
{
|
||||
XF86ConfBuffersPtr bufs;
|
||||
|
||||
if (ptr == NULL)
|
||||
return;
|
||||
|
||||
|
@ -163,15 +109,6 @@ xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)
|
|||
fprintf (cf, "\tGroup %d\n", ptr->dri_group);
|
||||
if (ptr->dri_mode)
|
||||
fprintf (cf, "\tMode 0%o\n", ptr->dri_mode);
|
||||
for (bufs = ptr->dri_buffers_lst; bufs; bufs = bufs->list.next) {
|
||||
fprintf (cf, "\tBuffers %d %d",
|
||||
bufs->buf_count, bufs->buf_size);
|
||||
if (bufs->buf_flags) fprintf (cf, " \"%s\"", bufs->buf_flags);
|
||||
if (bufs->buf_comment)
|
||||
fprintf(cf, "%s", bufs->buf_comment);
|
||||
else
|
||||
fprintf (cf, "\n");
|
||||
}
|
||||
fprintf (cf, "EndSection\n\n");
|
||||
}
|
||||
|
||||
|
@ -181,7 +118,6 @@ xf86freeDRI (XF86ConfDRIPtr ptr)
|
|||
if (ptr == NULL)
|
||||
return;
|
||||
|
||||
xf86freeBuffersList (ptr->dri_buffers_lst);
|
||||
TestFree (ptr->dri_comment);
|
||||
free (ptr);
|
||||
}
|
||||
|
|
|
@ -440,22 +440,11 @@ typedef struct
|
|||
}
|
||||
XF86ConfVendorRec, *XF86ConfVendorPtr;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GenericListRec list;
|
||||
int buf_count;
|
||||
int buf_size;
|
||||
char *buf_flags;
|
||||
char *buf_comment;
|
||||
}
|
||||
XF86ConfBuffersRec, *XF86ConfBuffersPtr;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char *dri_group_name;
|
||||
int dri_group;
|
||||
int dri_mode;
|
||||
XF86ConfBuffersPtr dri_buffers_lst;
|
||||
char *dri_comment;
|
||||
}
|
||||
XF86ConfDRIRec, *XF86ConfDRIPtr;
|
||||
|
|
|
@ -273,7 +273,6 @@ typedef enum {
|
|||
|
||||
/* DRI Tokens */
|
||||
GROUP,
|
||||
BUFFERS,
|
||||
|
||||
/* InputClass Tokens */
|
||||
MATCH_PRODUCT,
|
||||
|
|
Loading…
Reference in New Issue
Block a user