projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
tdfx
/
tdfx_screen.c
diff --git
a/src/mesa/drivers/dri/tdfx/tdfx_screen.c
b/src/mesa/drivers/dri/tdfx/tdfx_screen.c
index 2eb0024d40b7c737992dccb504565021beba197c..9f6b35faa28f09fa9ed397a45b1a2bbc1d45f37b 100644
(file)
--- a/
src/mesa/drivers/dri/tdfx/tdfx_screen.c
+++ b/
src/mesa/drivers/dri/tdfx/tdfx_screen.c
@@
-36,9
+36,7
@@
#include "tdfx_dri.h"
#include "tdfx_context.h"
#include "tdfx_lock.h"
#include "tdfx_dri.h"
#include "tdfx_context.h"
#include "tdfx_lock.h"
-#include "tdfx_vb.h"
#include "tdfx_span.h"
#include "tdfx_span.h"
-#include "tdfx_tris.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
@@
-70,7
+68,7
@@
static const __DRIextension *tdfxExtensions[] = {
static const GLuint __driNConfigOptions = 1;
static GLboolean
static const GLuint __driNConfigOptions = 1;
static GLboolean
-tdfxCreateScreen( __DRIscreen
Private
*sPriv )
+tdfxCreateScreen( __DRIscreen *sPriv )
{
tdfxScreenPrivate *fxScreen;
TDFXDRIPtr fxDRIPriv = (TDFXDRIPtr) sPriv->pDevPriv;
{
tdfxScreenPrivate *fxScreen;
TDFXDRIPtr fxDRIPriv = (TDFXDRIPtr) sPriv->pDevPriv;
@@
-121,7
+119,7
@@
tdfxCreateScreen( __DRIscreenPrivate *sPriv )
static void
static void
-tdfxDestroyScreen( __DRIscreen
Private
*sPriv )
+tdfxDestroyScreen( __DRIscreen *sPriv )
{
tdfxScreenPrivate *fxScreen = (tdfxScreenPrivate *) sPriv->private;
{
tdfxScreenPrivate *fxScreen = (tdfxScreenPrivate *) sPriv->private;
@@
-139,7
+137,7
@@
tdfxDestroyScreen( __DRIscreenPrivate *sPriv )
static GLboolean
static GLboolean
-tdfxInitDriver( __DRIscreen
Private
*sPriv )
+tdfxInitDriver( __DRIscreen *sPriv )
{
if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)sPriv );
{
if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)sPriv );
@@
-155,8
+153,8
@@
tdfxInitDriver( __DRIscreenPrivate *sPriv )
static GLboolean
static GLboolean
-tdfxCreateBuffer( __DRIscreen
Private
*driScrnPriv,
- __DRIdrawable
Private
*driDrawPriv,
+tdfxCreateBuffer( __DRIscreen *driScrnPriv,
+ __DRIdrawable *driDrawPriv,
const __GLcontextModes *mesaVis,
GLboolean isPixmap )
{
const __GLcontextModes *mesaVis,
GLboolean isPixmap )
{
@@
-227,14
+225,14
@@
tdfxCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void
static void
-tdfxDestroyBuffer(__DRIdrawable
Private
*driDrawPriv)
+tdfxDestroyBuffer(__DRIdrawable *driDrawPriv)
{
_mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
}
static void
{
_mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
}
static void
-tdfxSwapBuffers( __DRIdrawable
Private
*driDrawPriv )
+tdfxSwapBuffers( __DRIdrawable *driDrawPriv )
{
GET_CURRENT_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
@@
-253,7
+251,7
@@
tdfxSwapBuffers( __DRIdrawablePrivate *driDrawPriv )
* we have to do a glFinish (per the GLX spec).
*/
if ( ctx ) {
* we have to do a glFinish (per the GLX spec).
*/
if ( ctx ) {
- __DRIdrawable
Private
*curDrawPriv;
+ __DRIdrawable *curDrawPriv;
fxMesa = TDFX_CONTEXT(ctx);
curDrawPriv = fxMesa->driContext->driDrawablePriv;
fxMesa = TDFX_CONTEXT(ctx);
curDrawPriv = fxMesa->driContext->driDrawablePriv;
@@
-341,7
+339,7
@@
tdfxSwapBuffers( __DRIdrawablePrivate *driDrawPriv )
}
static const __DRIconfig **
}
static const __DRIconfig **
-tdfxFillInModes(__DRIscreen
Private
*psp,
+tdfxFillInModes(__DRIscreen *psp,
unsigned pixel_bits,
unsigned depth_bits,
unsigned stencil_bits,
unsigned pixel_bits,
unsigned depth_bits,
unsigned stencil_bits,
@@
-440,3
+438,10
@@
const struct __DriverAPIRec driDriverAPI = {
.WaitForSBC = NULL,
.SwapBuffersMSC = NULL
};
.WaitForSBC = NULL,
.SwapBuffersMSC = NULL
};
+
+/* This is the table of extensions that the loader will dlsym() for. */
+PUBLIC const __DRIextension *__driDriverExtensions[] = {
+ &driCoreExtension.base,
+ &driLegacyExtension.base,
+ NULL
+};