projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium/draw: initial code to properly support llvm in the draw module
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
gamma
/
gamma_xmesa.c
diff --git
a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
index 7b5b53589c64031a5beae4a97a4547e7eb576959..622121eed468db75bd14a61d5f035d3264239ad5 100644
(file)
--- a/
src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/
src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@
-24,7
+24,8
@@
* 3DLabs Gamma driver
*/
* 3DLabs Gamma driver
*/
-#include "gammacontext.h"
+#include "gamma_context.h"
+#include "gamma_macros.h"
#include "gamma_vb.h"
#include "main/context.h"
#include "main/matrix.h"
#include "gamma_vb.h"
#include "main/context.h"
#include "main/matrix.h"
@@
-36,7
+37,7
@@
#include "vbo/vbo.h"
static GLboolean
#include "vbo/vbo.h"
static GLboolean
-gammaInitDriver(__DRIscreen
Private
*sPriv)
+gammaInitDriver(__DRIscreen *sPriv)
{
sPriv->private = (void *) gammaCreateScreen( sPriv );
{
sPriv->private = (void *) gammaCreateScreen( sPriv );
@@
-49,7
+50,7
@@
gammaInitDriver(__DRIscreenPrivate *sPriv)
}
static void
}
static void
-gammaDestroyContext(__DRIcontext
Private
*driContextPriv)
+gammaDestroyContext(__DRIcontext *driContextPriv)
{
gammaContextPtr gmesa = (gammaContextPtr)driContextPriv->driverPrivate;
{
gammaContextPtr gmesa = (gammaContextPtr)driContextPriv->driverPrivate;
@@
-72,8
+73,8
@@
gammaDestroyContext(__DRIcontextPrivate *driContextPriv)
static GLboolean
static GLboolean
-gammaCreateBuffer( __DRIscreen
Private
*driScrnPriv,
- __DRIdrawable
Private
*driDrawPriv,
+gammaCreateBuffer( __DRIscreen *driScrnPriv,
+ __DRIdrawable *driDrawPriv,
const __GLcontextModes *mesaVis,
GLboolean isPixmap )
{
const __GLcontextModes *mesaVis,
GLboolean isPixmap )
{
@@
-94,17
+95,17
@@
gammaCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void
static void
-gammaDestroyBuffer(__DRIdrawable
Private
*driDrawPriv)
+gammaDestroyBuffer(__DRIdrawable *driDrawPriv)
{
_mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
}
static void
{
_mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
}
static void
-gammaSwapBuffers( __DRIdrawable
Private
*dPriv )
+gammaSwapBuffers( __DRIdrawable *dPriv )
{
if (dPriv->driContextPriv && dPriv->driContextPriv->driverPrivate) {
gammaContextPtr gmesa;
{
if (dPriv->driContextPriv && dPriv->driContextPriv->driverPrivate) {
gammaContextPtr gmesa;
- __DRIscreen
Private
*driScrnPriv;
+ __DRIscreen *driScrnPriv;
GLcontext *ctx;
gmesa = (gammaContextPtr) dPriv->driContextPriv->driverPrivate;
GLcontext *ctx;
gmesa = (gammaContextPtr) dPriv->driContextPriv->driverPrivate;
@@
-127,7
+128,7
@@
gammaSwapBuffers( __DRIdrawablePrivate *dPriv )
int i;
int nRect = dPriv->numClipRects;
drm_clip_rect_t *pRect = dPriv->pClipRects;
int i;
int nRect = dPriv->numClipRects;
drm_clip_rect_t *pRect = dPriv->pClipRects;
- __DRIscreen
Private
*driScrnPriv = gmesa->driScreen;
+ __DRIscreen *driScrnPriv = gmesa->driScreen;
GLINTDRIPtr gDRIPriv = (GLINTDRIPtr)driScrnPriv->pDevPriv;
CHECK_DMA_BUFFER(gmesa, 2);
GLINTDRIPtr gDRIPriv = (GLINTDRIPtr)driScrnPriv->pDevPriv;
CHECK_DMA_BUFFER(gmesa, 2);
@@
-193,9
+194,9
@@
gammaSwapBuffers( __DRIdrawablePrivate *dPriv )
}
static GLboolean
}
static GLboolean
-gammaMakeCurrent(__DRIcontext
Private
*driContextPriv,
- __DRIdrawable
Private
*driDrawPriv,
- __DRIdrawable
Private
*driReadPriv)
+gammaMakeCurrent(__DRIcontext *driContextPriv,
+ __DRIdrawable *driDrawPriv,
+ __DRIdrawable *driReadPriv)
{
if (driContextPriv) {
GET_CURRENT_CONTEXT(ctx);
{
if (driContextPriv) {
GET_CURRENT_CONTEXT(ctx);
@@
-232,7
+233,7
@@
newGammaCtx->new_state |= GAMMA_NEW_WINDOW; /* FIXME */
static GLboolean
static GLboolean
-gammaUnbindContext( __DRIcontext
Private
*driContextPriv )
+gammaUnbindContext( __DRIcontext *driContextPriv )
{
return GL_TRUE;
}
{
return GL_TRUE;
}
@@
-254,12
+255,19
@@
const struct __DriverAPIRec driDriverAPI = {
/*
* This is the bootstrap function for the driver.
* The __driCreateScreen name is the symbol that libGL.so fetches.
/*
* This is the bootstrap function for the driver.
* The __driCreateScreen name is the symbol that libGL.so fetches.
- * Return: pointer to a __DRIscreen
Private
.
+ * Return: pointer to a __DRIscreen.
*/
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
*/
void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
int numConfigs, __GLXvisualConfig *config)
{
- __DRIscreen
Private
*psp;
+ __DRIscreen *psp;
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &gammaAPI);
return (void *) psp;
}
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &gammaAPI);
return (void *) psp;
}
+
+/* This is the table of extensions that the loader will dlsym() for. */
+PUBLIC const __DRIextension *__driDriverExtensions[] = {
+ &driCoreExtension.base,
+ &driLegacyExtension.base,
+ NULL
+};