Drop GLcontext typedef and use struct gl_context instead

[mesa.git] / src / mesa / drivers / windows / gldirect / dx7 / gld_driver_dx7.c

diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
index 4a38b35adf3d9be15eda6e251ebfcee944317d40..1c43a38557d8f93e93290c4286becf993eb69f04 100644 (file)
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
@@ -69,7 +69,7 @@ const float _fPersp_33 = 1.6f;
 //---------------------------------------------------------------------------
 
 void _gld_mesa_warning(
-       __GLcontext *gc,
+       __struct gl_context *gc,
        char *str)
 {
        // Intercept Mesa's internal warning mechanism
@@ -79,7 +79,7 @@ void _gld_mesa_warning(
 //---------------------------------------------------------------------------
 
 void _gld_mesa_fatal(
-       __GLcontext *gc,
+       __struct gl_context *gc,
        char *str)
 {
        // Intercept Mesa's internal fatal-message mechanism
@@ -199,7 +199,7 @@ D3DBLEND _gldConvertBlendFunc(
 //---------------------------------------------------------------------------
 
 void gld_Noop_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 #ifdef _DEBUG
        gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@ -209,7 +209,7 @@ void gld_Noop_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Error_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 #ifdef _DEBUG
        // Quite useless.
@@ -222,7 +222,7 @@ void gld_Error_DX7(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_set_draw_buffer_DX7(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLenum mode)
 {
    (void) ctx;
@@ -237,7 +237,7 @@ static GLboolean gld_set_draw_buffer_DX7(
 //---------------------------------------------------------------------------
 
 static void gld_set_read_buffer_DX7(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        struct gl_framebuffer *buffer,
        GLenum mode)
 {
@@ -251,7 +251,7 @@ static void gld_set_read_buffer_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Clear_DX7(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLbitfield mask,
        GLboolean all,
        GLint x,
@@ -342,7 +342,7 @@ void gld_Clear_DX7(
 
 // Mesa 5: Parameter change
 static void gld_buffer_size_DX7(
-//     GLcontext *ctx,
+//     struct gl_context *ctx,
        struct gl_framebuffer *fb,
        GLuint *width,
        GLuint *height)
@@ -356,14 +356,14 @@ static void gld_buffer_size_DX7(
 //---------------------------------------------------------------------------
 
 static void gld_Finish_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 }
 
 //---------------------------------------------------------------------------
 
 static void gld_Flush_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gld    = GLD_GET_CONTEXT(ctx);
 
@@ -379,7 +379,7 @@ static void gld_Flush_DX7(
 //---------------------------------------------------------------------------
 
 void gld_NEW_STENCIL(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -404,7 +404,7 @@ void gld_NEW_STENCIL(
 //---------------------------------------------------------------------------
 
 void gld_NEW_COLOR(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -438,7 +438,7 @@ void gld_NEW_COLOR(
 //---------------------------------------------------------------------------
 
 void gld_NEW_DEPTH(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -451,7 +451,7 @@ void gld_NEW_DEPTH(
 //---------------------------------------------------------------------------
 
 void gld_NEW_POLYGON(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -516,7 +516,7 @@ void gld_NEW_POLYGON(
 //---------------------------------------------------------------------------
 
 void gld_NEW_FOG(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -571,7 +571,7 @@ void gld_NEW_FOG(
 //---------------------------------------------------------------------------
 
 void gld_NEW_LIGHT(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7  *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -591,7 +591,7 @@ void gld_NEW_LIGHT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_MODELVIEW(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -639,7 +639,7 @@ void gld_NEW_MODELVIEW(
 //---------------------------------------------------------------------------
 
 void gld_NEW_PROJECTION(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -718,7 +718,7 @@ void gldOrthoHook_DX7(
 //---------------------------------------------------------------------------
 
 void gld_NEW_VIEWPORT(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7          *gld    = GLD_GET_DX7_DRIVER(gldCtx);
@@ -760,7 +760,7 @@ void gld_NEW_VIEWPORT(
 //---------------------------------------------------------------------------
 
 __inline BOOL _gldAnyEvalEnabled(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        struct gl_eval_attrib *eval = &ctx->Eval;
 
@@ -792,7 +792,7 @@ __inline BOOL _gldAnyEvalEnabled(
 //---------------------------------------------------------------------------
 
 BOOL _gldChooseInternalPipeline(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLD_driver_dx7 *gld)
 {
 //     return TRUE;    // DEBUGGING: ALWAYS USE MESA
@@ -856,7 +856,7 @@ BOOL _gldChooseInternalPipeline(
 //---------------------------------------------------------------------------
 
 void gld_update_state_DX7(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLuint new_state)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -991,7 +991,7 @@ void gld_update_state_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Viewport_DX7(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLint x,
        GLint y,
        GLsizei w,
@@ -1053,11 +1053,11 @@ void gld_Viewport_DX7(
 
 //---------------------------------------------------------------------------
 
-extern BOOL dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 // Mesa 5: Parameter change
 void gldResizeBuffers_DX7(
-//     GLcontext *ctx)
+//     struct gl_context *ctx)
        struct gl_framebuffer *fb)
 {
        GET_CURRENT_CONTEXT(ctx);
@@ -1069,7 +1069,7 @@ void gldResizeBuffers_DX7(
 // This is only for debugging.
 // To use, plug into ctx->Driver.Enable pointer below.
 void gld_Enable(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLenum e,
        GLboolean b)
 {
@@ -1082,10 +1082,10 @@ void gld_Enable(
 // Driver pointer setup
 //---------------------------------------------------------------------------
 
-extern const GLubyte* _gldGetStringGeneric(GLcontext*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);
 
 void gldSetupDriverPointers_DX7(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx7  *gld    = GLD_GET_DX7_DRIVER(gldCtx);