uses the NEW_INTERFACE now so _SOLO isn't necessary anymore.
Tested with the hardware that I own.
CC = gcc
CXX = g++
-CCOMMON = -D_SOLO -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L
+CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L
CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
#include "extensions.h"
#include "utils.h"
-#if !defined( DRI_NEW_INTERFACE_ONLY ) && !defined( _SOLO )
+#if !defined( DRI_NEW_INTERFACE_ONLY )
#include "xf86dri.h" /* For XF86DRIQueryVersion prototype. */
#endif
"but got version %d.%d.%d";
int major, minor, patch;
-#ifndef _SOLO
/* Check the DRI version */
if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
if (major != dri_major || minor < dri_minor) {
sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
return GL_FALSE;
}
-#else
- (void)major;(void)minor;(void)patch;
-#endif
/* Check that the DRM driver version is compatible */
if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) {
if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
/* FIXME: This doesn't seem like the right thing to return here.
*/
-#ifndef _SOLO
return GLX_BAD_CONTEXT;
-#else
- return -1;
-#endif
}
dont_wait = 0;
if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
/* FIXME: This doesn't seem like the right thing to return here.
*/
-#ifndef _SOLO
return GLX_BAD_CONTEXT;
-#else
- return -1;
-#endif
}
}
void driDrawableInitVBlank( __DRIdrawablePrivate *priv, GLuint flags )
{
-#ifndef _SOLO
if ( priv->pdraw->swap_interval == (unsigned)-1 ) {
priv->pdraw->swap_interval = (flags & VBLANK_FLAG_THROTTLE) != 0 ? 1 : 0;
}
-#endif
}
vbl.request.type = DRM_VBLANK_ABSOLUTE;
if ( (flags & VBLANK_FLAG_INTERVAL) != 0 ) {
-#ifndef _SOLO
interval = priv->pdraw->swap_interval;
-#else
- interval = 0;
-#endif
/* this must have been initialized when the drawable was first bound
* to a direct rendering context. */
assert ( interval != (unsigned)-1 );
#include <expat.h>
#include <fcntl.h>
#include <unistd.h>
+#define __USE_GNU /* defines program_invocation_short_name */
#include <errno.h>
#include "imports.h"
#include "dri_util.h"
userData.cache = cache;
userData.screenNum = screenNum;
userData.driverName = driverName;
-#ifndef _SOLO
userData.execName = GET_PROGRAM_NAME();
-#else
- userData.execName = "Solo";
-#endif
if ((home = getenv ("HOME"))) {
GLuint len = strlen (home);
#ifndef _FFB_DAC_H
#define _FFB_DAC_H
-#if defined( _SOLO ) || defined( DRI_NEW_INTERFACE_ONLY )
+#if defined( DRI_NEW_INTERFACE_ONLY )
#define Bool int
#endif
* The __driCreateScreen name is the symbol that libGL.so fetches.
* Return: pointer to a __DRIscreenPrivate.
*/
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &gammaAPI);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &gammaAPI);
- return (void *) psp;
-}
-#endif
#include "i810tris.h"
#include "i810ioctl.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
#ifdef USE_NEW_INTERFACE
static PFNGLXCREATECONTEXTMODES create_context_modes = NULL;
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i810API);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &i810API);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
/**
}
#endif
-#ifndef _SOLO
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
}
}
}
-#endif
return GL_TRUE;
}
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i830API);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &i830API);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
}
}
-#ifndef _SOLO
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
}
}
}
-#endif
return GL_TRUE;
}
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &intelAPI);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &i830API);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
#include "utils.h"
#include "vblank.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
/* Mach64 configuration
*/
}
mach64Screen->driScreen = sPriv;
-#ifndef _SOLO
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
(*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" );
}
}
-#endif
return mach64Screen;
}
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mach64API);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &mach64API);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
/**
#include "utils.h"
#include "vblank.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
/* MGA configuration
*/
mgaScreen->linecomp_sane = (sPriv->ddxMajor > 1) || (sPriv->ddxMinor > 1)
|| ((sPriv->ddxMinor == 1) && (sPriv->ddxPatch > 0));
-#ifndef _SOLO
+
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
}
}
}
-#endif
if (serverInfo->chipset != MGA_CARD_TYPE_G200 &&
serverInfo->chipset != MGA_CARD_TYPE_G400) {
mmesa->vblank_flags = ((mmesa->mgaScreen->irq == 0)
|| !mmesa->mgaScreen->linecomp_sane)
? VBLANK_FLAG_NO_IRQ : driGetDefaultVBlankFlags(&mmesa->optionCache);
-#ifndef _SOLO
+
mmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" );
if ( mmesa->get_ust == NULL ) {
mmesa->get_ust = get_ust_nop;
}
-#else
- mmesa->get_ust = get_ust_nop;
-#endif
(*mmesa->get_ust)( & mmesa->swap_ust );
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mgaAPI);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &mgaAPI);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
else
mgaXMesaSetBackClipRects( mmesa );
-#ifndef _SOLO
sarea->req_drawable = driDrawable->draw;
sarea->req_draw_buffer = mmesa->draw_buffer;
-#endif
+
mgaUpdateClipping( mmesa->glCtx );
mgaCalcViewport( mmesa->glCtx );
#include "utils.h"
#include "vblank.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
/* R128 configuration
*/
}
r128Screen->driScreen = sPriv;
-#ifndef _SOLO
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
(*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" );
}
}
-#endif
return r128Screen;
}
* The __driCreateScreen name is the symbol that libGL.so fetches.
* Return: pointer to a __DRIscreenPrivate.
*/
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r128API);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &r128API);
- return (void *) psp;
-}
-#endif
#endif /* DRI_NEW_INTERFACE_ONLY */
#define _R128_H_
#include "dri_util.h"
-#ifndef _SOLO
-#include "xf86str.h"
-
- /* PCI support */
-#include "xf86Pci.h"
-
- /* XAA and Cursor Support */
-#include "xaa.h"
-#include "xf86Cursor.h"
-
- /* DDC support */
-#include "xf86DDC.h"
-
- /* Xv support */
-#include "xf86xv.h"
-
- /* DRI support */
-#ifdef XF86DRI
-#define _XF86DRI_SERVER_
-#include "r128_dripriv.h"
-#include "dri.h"
-#include "GL/glxint.h"
-#endif
-#endif
-#ifdef _SOLO
-#define XF86DRI
-#endif
#define R128_DEBUG 0 /* Turn off debugging output */
#define R128_IDLE_RETRY 32 /* Fall out of idle loops after this count */
uint32_t palette[256];
} R128SaveRec, *R128SavePtr;
-#ifndef _SOLO
-typedef struct {
- CARD16 reference_freq;
- CARD16 reference_div;
- uint32_t min_pll_freq;
- uint32_t max_pll_freq;
- CARD16 xclk;
-} R128PLLRec, *R128PLLPtr;
-
-typedef struct {
- int bitsPerPixel;
- int depth;
- int displayWidth;
- int pixel_code;
- int pixel_bytes;
- DisplayModePtr mode;
-} R128FBLayout;
-#endif
-
typedef struct {
-#ifndef _SOLO
- EntityInfoPtr pEnt;
- pciVideoPtr PciInfo;
- PCITAG PciTag;
-#endif
int Chipset;
GLboolean Primary;
unsigned long FbMapSize; /* Size of frame buffer, in bytes */
int Flags; /* Saved copy of mode flags */
-#ifndef _SOLO
- uint8_t BIOSDisplay; /* Device the BIOS is set to display to */
-
- GLboolean HasPanelRegs; /* Current chip can connect to a FP */
- uint8_t *VBIOS; /* Video BIOS for mode validation on FPs */
- int FPBIOSstart; /* Start of the flat panel info */
-#endif
/* Computed values for FPs */
int PanelXRes;
int PanelYRes;
int VSyncWidth;
int VBlank;
int PanelPwrDly;
-#ifndef _SOLO
- R128PLLRec pll;
- R128RAMPtr ram;
-
- R128SaveRec SavedReg; /* Original (text) mode */
- R128SaveRec ModeReg; /* Current mode */
- GLboolean (*CloseScreen)(int, ScreenPtr);
- void (*BlockHandler)(int, pointer, pointer, pointer);
-
- GLboolean PaletteSavedOnVT; /* Palette saved on last VT switch */
-
- XAAInfoRecPtr accel;
- GLboolean accelOn;
- xf86CursorInfoPtr cursor;
-#endif
+
unsigned long cursor_start;
unsigned long cursor_end;
int scanline_y;
int scanline_w;
int scanline_h;
-#ifdef XF86DRI
+
int scanline_hpass;
int scanline_x1clip;
int scanline_x2clip;
int scanline_rop;
int scanline_fg;
int scanline_bg;
-#endif /* XF86DRI */
+
int scanline_words;
int scanline_direct;
int scanline_bpp; /* Only used for ImageWrite */
-#ifndef _SOLO
- DGAModePtr DGAModes;
- int numDGAModes;
- GLboolean DGAactive;
- int DGAViewportStatus;
- DGAFunctionRec DGAFuncs;
-
- R128FBLayout CurrentLayout;
-#endif
-#ifdef XF86DRI
drm_context_t drmCtx;
-#ifndef _SOLO
- DRIInfoPtr pDRIInfo;
- int numVisualConfigs;
- __GLXvisualConfig *pVisualConfigs;
- R128ConfigPrivPtr pVisualConfigsPriv;
-#endif
drmSize registerSize;
drm_handle_t registerHandle;
uint32_t gen_int_cntl;
GLboolean DMAForXv;
-#endif
-#ifndef _SOLO
- XF86VideoAdaptorPtr adaptor;
- void (*VideoTimerCallback)(ScrnInfoPtr, Time);
- int videoKey;
- GLboolean showCache;
- OptionInfoPtr Options;
-
- GLboolean isDFP;
- GLboolean isPro2;
- I2CBusPtr pI2CBus;
- uint32_t DDCReg;
-#endif
} R128InfoRec, *R128InfoPtr;
#define R128WaitForFifo(pScrn, entries) \
rmesa->prefer_gart_client_texturing =
(getenv("R200_GART_CLIENT_TEXTURES") != 0);
-#ifndef _SOLO
+
rmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" );
if ( rmesa->get_ust == NULL ) {
rmesa->get_ust = get_ust_nop;
}
-#else
- rmesa->get_ust = get_ust_nop;
-#endif
(*rmesa->get_ust)( & rmesa->swap_ust );
* the kernel data structures, and the current context to get the
* device fd.
*/
-#ifndef _SOLO
void *r200AllocateMemoryMESA(__DRInativeDisplay *dpy, int scrn, GLsizei size,
GLfloat readfreq, GLfloat writefreq,
GLfloat priority)
return card_offset - rmesa->r200Screen->gart_base;
}
-#endif
GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer,
GLint size )
extern void r200WaitForVBlank( r200ContextPtr rmesa );
extern void r200InitIoctlFuncs( struct dd_function_table *functions );
-#ifndef _SOLO
extern void *r200AllocateMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLsizei size, GLfloat readfreq,
GLfloat writefreq, GLfloat priority );
extern void r200FreeMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLvoid *pointer );
extern GLuint r200GetMemoryOffsetMESA( __DRInativeDisplay *dpy, int scrn, const GLvoid *pointer );
-#endif
+
extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer,
GLint size );
#include "utils.h"
#include "vblank.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
/* R200 configuration
*/
screen->driScreen = sPriv;
screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
-#ifndef _SOLO
+
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
}
}
}
-#endif
return screen;
}
*
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r200API);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &r200API);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
rmesa->vblank_flags = (rmesa->radeonScreen->irq != 0)
? driGetDefaultVBlankFlags(&rmesa->optionCache) : VBLANK_FLAG_NO_IRQ;
-#ifndef _SOLO
+
rmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" );
if ( rmesa->get_ust == NULL ) {
rmesa->get_ust = get_ust_nop;
}
-#else
- rmesa->get_ust = get_ust_nop;
-#endif
-
(*rmesa->get_ust)( & rmesa->swap_ust );
#include "context.h"
#include "vblank.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
/* Radeon configuration
*/
screen->logTexGranularity[RADEON_GART_TEX_HEAP] =
dri_priv->log2GARTTexGran;
}
-#ifndef _SOLO
+
if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
}
}
-#endif
+
screen->driScreen = sPriv;
screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
return screen;
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &radeonAPI);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &radeonAPI);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
/**
#include "xmlpool.h"
-#ifndef _SOLO
#include "GL/internal/dri_interface.h"
-#endif
const char __driConfigOptions[] =
DRI_CONF_BEGIN
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &sisAPI);
return (void *)psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &sisAPI);
- return (void *)psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
/**
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &tdfxAPI);
return (void *) psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &tdfxAPI);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
#include "via_ioctl.h"
#include "via_fb.h"
-#ifndef _SOLO
-#include <X11/Xlibint.h>
-#endif
#include <stdio.h>
#include "macros.h"
_tnl_allow_pixel_fog(ctx, GL_FALSE);
_tnl_allow_vertex_fog(ctx, GL_TRUE);
-#ifndef _SOLO
/* vmesa->display = dpy; */
vmesa->display = sPriv->display;
-#endif
vmesa->hHWContext = driContextPriv->hHWContext;
vmesa->driFd = sPriv->fd;
#include "dri_util.h"
-#ifndef _SOLO
-#include <X11/Xlibint.h>
-#endif
-
#include "mtypes.h"
#include "drm.h"
#include "mm.h"
drm_context_t hHWContext;
drm_hw_lock_t *driHwLock;
int driFd;
-#ifndef _SOLO
- Display *display;
-#endif
+ __DRInativeDisplay *display;
__DRIdrawablePrivate *driDrawable;
__DRIscreenPrivate *driScreen;
* Return: pointer to a __DRIscreenPrivate.
*/
#if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &viaAPI);
return (void *)psp;
}
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
- struct DRIDriverContextRec *driverContext)
-{
- __DRIscreenPrivate *psp;
- psp = __driUtilCreateScreen(driver, driverContext, &viaAPI);
- return (void *) psp;
-}
-#endif
#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
projects / platform / upstream / mesa.git / commitdiff