More ephyr/glamor glue.
This commit is contained in:
parent
0ec823ce5b
commit
da6e0ffad2
|
@ -25,7 +25,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
/** @file
|
||||
/** @file glamor.c
|
||||
* This file covers the initialization and teardown of glamor, and has various
|
||||
* functions not responsible for performing rendering.
|
||||
*/
|
||||
|
@ -35,3 +35,13 @@
|
|||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "glamor.h"
|
||||
|
||||
/** Set up glamor for an already-configured GL context. */
|
||||
Bool
|
||||
glamor_init(ScreenPtr screen)
|
||||
{
|
||||
return Success;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,3 +24,17 @@
|
|||
* Eric Anholt <eric@anholt.net>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef GLAMOR_H
|
||||
#define GLAMOR_H
|
||||
|
||||
#include "scrnintstr.h"
|
||||
#include "pixmapstr.h"
|
||||
#include "windowstr.h"
|
||||
#include "gcstruct.h"
|
||||
#include "picturestr.h"
|
||||
#include "fb.h"
|
||||
|
||||
#endif /* GLAMOR_H */
|
||||
|
||||
Bool glamor_init(ScreenPtr screen);
|
||||
|
|
|
@ -24,7 +24,8 @@ bin_PROGRAMS = Xephyr
|
|||
|
||||
HOSTX_SRCS = \
|
||||
hostx.c \
|
||||
hostx.h
|
||||
hostx.h \
|
||||
ephyr_host_glamor.c
|
||||
|
||||
HOSTVIDEO_SRCS = \
|
||||
ephyrvideo.c \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright © 2006 Intel Corporation
|
||||
* Copyright © 2008 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
|
@ -30,7 +30,7 @@
|
|||
#endif
|
||||
|
||||
#include "ephyr.h"
|
||||
/*#include "glamor.h"*/
|
||||
#include "glamor.h"
|
||||
|
||||
/**
|
||||
* This function initializes EXA to use the fake acceleration implementation
|
||||
|
@ -38,22 +38,29 @@
|
|||
* correct driver with which to test changes to the EXA core.
|
||||
*/
|
||||
Bool
|
||||
ephyr_glamor_init(ScreenPtr pScreen)
|
||||
ephyr_glamor_init(ScreenPtr screen)
|
||||
{
|
||||
KdScreenPriv(screen);
|
||||
KdScreenInfo *kd_screen = pScreenPriv->screen;
|
||||
|
||||
ephyr_glamor_host_create_context(kd_screen);
|
||||
|
||||
glamor_init(screen);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
ephyr_glamor_enable(ScreenPtr pScreen)
|
||||
ephyr_glamor_enable(ScreenPtr screen)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ephyr_glamor_disable(ScreenPtr pScreen)
|
||||
ephyr_glamor_disable(ScreenPtr screen)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
ephyr_glamor_fini(ScreenPtr pScreen)
|
||||
ephyr_glamor_fini(ScreenPtr screen)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -261,4 +261,7 @@ int hostx_has_dri (void) ;
|
|||
int hostx_has_glx (void) ;
|
||||
#endif /* XF86DRI */
|
||||
|
||||
/* ephyr_glamor_host.c */
|
||||
void ephyr_glamor_host_create_context(EphyrScreenInfo ephyr_screen);
|
||||
|
||||
#endif /*_XLIBS_STUFF_H_*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user