projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dri/nouveau: Kill a bunch of ternary operators.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
sis
/
sis_context.c
diff --git
a/src/mesa/drivers/dri/sis/sis_context.c
b/src/mesa/drivers/dri/sis/sis_context.c
index f501e7ad2e9dc128c4b7323f872ae32b19013132..c5a9fdfb2a039b701a0cdb66d9673fe43028d15e 100644
(file)
--- a/
src/mesa/drivers/dri/sis/sis_context.c
+++ b/
src/mesa/drivers/dri/sis/sis_context.c
@@
-43,8
+43,6
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "sis_alloc.h"
#include "main/imports.h"
#include "sis_alloc.h"
#include "main/imports.h"
-#include "main/matrix.h"
-#include "main/extensions.h"
#include "utils.h"
#include "main/framebuffer.h"
#include "utils.h"
#include "main/framebuffer.h"
@@
-55,7
+53,6
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vbo/vbo.h"
#include "tnl/tnl.h"
#include "vbo/vbo.h"
#include "tnl/tnl.h"
-#include "tnl/t_pipeline.h"
#define need_GL_EXT_fog_coord
#define need_GL_EXT_secondary_color
#define need_GL_EXT_fog_coord
#define need_GL_EXT_secondary_color
@@
-83,6
+80,7
@@
static struct dri_extension card_extensions[] =
{ NULL, NULL }
};
{ NULL, NULL }
};
+#if 0
static struct dri_extension card_extensions_6326[] =
{
/*{ "GL_ARB_texture_border_clamp", NULL },*/
static struct dri_extension card_extensions_6326[] =
{
/*{ "GL_ARB_texture_border_clamp", NULL },*/
@@
-90,6
+88,7
@@
static struct dri_extension card_extensions_6326[] =
/*{ "GL_MESA_ycbcr_texture", NULL },*/
{ NULL, NULL }
};
/*{ "GL_MESA_ycbcr_texture", NULL },*/
{ NULL, NULL }
};
+#endif
static const struct dri_debug_control debug_control[] =
{
static const struct dri_debug_control debug_control[] =
{
@@
-148,7
+147,7
@@
WaitingFor3dIdle(sisContextPtr smesa, int wLen)
}
}
}
}
-void sisReAllocateBuffers(
GLcontext *ctx, GL
framebuffer *drawbuffer,
+void sisReAllocateBuffers(
struct gl_context *ctx, struct gl_
framebuffer *drawbuffer,
GLuint width, GLuint height)
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
GLuint width, GLuint height)
{
sisContextPtr smesa = SIS_CONTEXT(ctx);
@@
-159,12
+158,13
@@
void sisReAllocateBuffers(GLcontext *ctx, GLframebuffer *drawbuffer,
}
GLboolean
}
GLboolean
-sisCreateContext( const __GLcontextModes *glVisual,
- __DRIcontextPrivate *driContextPriv,
+sisCreateContext( gl_api api,
+ const struct gl_config *glVisual,
+ __DRIcontext *driContextPriv,
void *sharedContextPrivate )
{
void *sharedContextPrivate )
{
-
GL
context *ctx, *shareCtx;
- __DRIscreen
Private
*sPriv = driContextPriv->driScreenPriv;
+
struct gl_
context *ctx, *shareCtx;
+ __DRIscreen *sPriv = driContextPriv->driScreenPriv;
sisContextPtr smesa;
sisScreenPtr sisScreen;
int i;
sisContextPtr smesa;
sisScreenPtr sisScreen;
int i;
@@
-337,7
+337,7
@@
sisCreateContext( const __GLcontextModes *glVisual,
}
void
}
void
-sisDestroyContext ( __DRIcontext
Private
*driContextPriv )
+sisDestroyContext ( __DRIcontext *driContextPriv )
{
sisContextPtr smesa = (sisContextPtr)driContextPriv->driverPrivate;
{
sisContextPtr smesa = (sisContextPtr)driContextPriv->driverPrivate;
@@
-365,9
+365,9
@@
sisDestroyContext ( __DRIcontextPrivate *driContextPriv )
}
GLboolean
}
GLboolean
-sisMakeCurrent( __DRIcontext
Private
*driContextPriv,
- __DRIdrawable
Private
*driDrawPriv,
- __DRIdrawable
Private
*driReadPriv )
+sisMakeCurrent( __DRIcontext *driContextPriv,
+ __DRIdrawable *driDrawPriv,
+ __DRIdrawable *driReadPriv )
{
if ( driContextPriv ) {
GET_CURRENT_CONTEXT(ctx);
{
if ( driContextPriv ) {
GET_CURRENT_CONTEXT(ctx);
@@
-381,8
+381,8
@@
sisMakeCurrent( __DRIcontextPrivate *driContextPriv,
newSisCtx->driDrawable = driDrawPriv;
newSisCtx->driDrawable = driDrawPriv;
- drawBuffer = (
GL
framebuffer *)driDrawPriv->driverPrivate;
- readBuffer = (
GL
framebuffer *)driReadPriv->driverPrivate;
+ drawBuffer = (
struct gl_
framebuffer *)driDrawPriv->driverPrivate;
+ readBuffer = (
struct gl_
framebuffer *)driReadPriv->driverPrivate;
_mesa_make_current( newSisCtx->glCtx, drawBuffer, readBuffer );
_mesa_make_current( newSisCtx->glCtx, drawBuffer, readBuffer );
@@
-396,7
+396,7
@@
sisMakeCurrent( __DRIcontextPrivate *driContextPriv,
}
GLboolean
}
GLboolean
-sisUnbindContext( __DRIcontext
Private
*driContextPriv )
+sisUnbindContext( __DRIcontext *driContextPriv )
{
return GL_TRUE;
}
{
return GL_TRUE;
}