frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More ephyr/glamor glue.

This commit is contained in:
Eric Anholt 2008-12-16 14:00:05 -08:00 committed by Zhigang Gong
parent 0ec823ce5b
commit da6e0ffad2
5 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glamor/glamor.c
View File

@ -25,7 +25,7 @@
* *
*/ */
/** @file /** @file glamor.c
* This file covers the initialization and teardown of glamor, and has various * This file covers the initialization and teardown of glamor, and has various
* functions not responsible for performing rendering. * functions not responsible for performing rendering.
*/ */
@ -35,3 +35,13 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include "glamor.h"
/** Set up glamor for an already-configured GL context. */
Bool
glamor_init(ScreenPtr screen)
{
return Success;
}

14
glamor/glamor.h
View File

@ -24,3 +24,17 @@
* Eric Anholt <eric@anholt.net> * 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);

3
hw/kdrive/ephyr/Makefile.am
View File

@ -24,7 +24,8 @@ bin_PROGRAMS = Xephyr
HOSTX_SRCS = \ HOSTX_SRCS = \
hostx.c \ hostx.c \
hostx.h hostx.h \
ephyr_host_glamor.c
HOSTVIDEO_SRCS = \ HOSTVIDEO_SRCS = \
ephyrvideo.c \ ephyrvideo.c \

19
hw/kdrive/ephyr/ephyr_glamor.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2006 Intel Corporation * Copyright © 2008 Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -30,7 +30,7 @@
#endif #endif
#include "ephyr.h" #include "ephyr.h"
/*#include "glamor.h"*/ #include "glamor.h"
/** /**
* This function initializes EXA to use the fake acceleration implementation * 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. * correct driver with which to test changes to the EXA core.
*/ */
Bool 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; return TRUE;
} }
void void
ephyr_glamor_enable(ScreenPtr pScreen) ephyr_glamor_enable(ScreenPtr screen)
{ {
} }
void void
ephyr_glamor_disable(ScreenPtr pScreen) ephyr_glamor_disable(ScreenPtr screen)
{ {
} }
void void
ephyr_glamor_fini(ScreenPtr pScreen) ephyr_glamor_fini(ScreenPtr screen)
{ {
} }

3
hw/kdrive/ephyr/hostx.h
View File

@ -261,4 +261,7 @@ int hostx_has_dri (void) ;
int hostx_has_glx (void) ; int hostx_has_glx (void) ;
#endif /* XF86DRI */ #endif /* XF86DRI */
/* ephyr_glamor_host.c */
void ephyr_glamor_host_create_context(EphyrScreenInfo ephyr_screen);
#endif /*_XLIBS_STUFF_H_*/ #endif /*_XLIBS_STUFF_H_*/