Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / windows / gldirect / dx8 / gld_driver_dx8.c

diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
index 7eeb9db2d15fd2f0f24c051564e144d8088e7130..c4c2e0b5676969dae03351051003b097ef41902f 100644 (file)
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.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_DX8(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 #ifdef _DEBUG
        gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@ -209,7 +209,7 @@ void gld_Noop_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Error_DX8(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 #ifdef _DEBUG
        // Quite useless.
@@ -222,7 +222,7 @@ void gld_Error_DX8(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_set_draw_buffer_DX8(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLenum mode)
 {
    (void) ctx;
@@ -237,8 +237,8 @@ static GLboolean gld_set_draw_buffer_DX8(
 //---------------------------------------------------------------------------
 
 static void gld_set_read_buffer_DX8(
-       GLcontext *ctx,
-       GLframebuffer *buffer,
+       struct gl_context *ctx,
+       struct gl_framebuffer *buffer,
        GLenum mode)
 {
    /* separate read buffer not supported */
@@ -251,7 +251,7 @@ static void gld_set_read_buffer_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Clear_DX8(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLbitfield mask,
        GLboolean all,
        GLint x,
@@ -342,8 +342,8 @@ void gld_Clear_DX8(
 
 // Mesa 5: Parameter change
 static void gld_buffer_size_DX8(
-//     GLcontext *ctx,
-       GLframebuffer *fb,
+//     struct gl_context *ctx,
+       struct gl_framebuffer *fb,
        GLuint *width,
        GLuint *height)
 {
@@ -356,14 +356,14 @@ static void gld_buffer_size_DX8(
 //---------------------------------------------------------------------------
 
 static void gld_Finish_DX8(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
 }
 
 //---------------------------------------------------------------------------
 
 static void gld_Flush_DX8(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gld    = GLD_GET_CONTEXT(ctx);
 
@@ -379,7 +379,7 @@ static void gld_Flush_DX8(
 //---------------------------------------------------------------------------
 
 void gld_NEW_STENCIL(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_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_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -436,7 +436,7 @@ void gld_NEW_COLOR(
 //---------------------------------------------------------------------------
 
 void gld_NEW_DEPTH(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -449,7 +449,7 @@ void gld_NEW_DEPTH(
 //---------------------------------------------------------------------------
 
 void gld_NEW_POLYGON(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -514,7 +514,7 @@ void gld_NEW_POLYGON(
 //---------------------------------------------------------------------------
 
 void gld_NEW_FOG(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -569,7 +569,7 @@ void gld_NEW_FOG(
 //---------------------------------------------------------------------------
 
 void gld_NEW_LIGHT(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8  *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -589,7 +589,7 @@ void gld_NEW_LIGHT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_MODELVIEW(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -621,7 +621,7 @@ void gld_NEW_MODELVIEW(
 //---------------------------------------------------------------------------
 
 void gld_NEW_PROJECTION(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -700,7 +700,7 @@ void gldOrthoHook_DX8(
 //---------------------------------------------------------------------------
 
 void gld_NEW_VIEWPORT(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context                     *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8          *gld    = GLD_GET_DX8_DRIVER(gldCtx);
@@ -742,7 +742,7 @@ void gld_NEW_VIEWPORT(
 //---------------------------------------------------------------------------
 
 __inline BOOL _gldAnyEvalEnabled(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        struct gl_eval_attrib *eval = &ctx->Eval;
 
@@ -774,7 +774,7 @@ __inline BOOL _gldAnyEvalEnabled(
 //---------------------------------------------------------------------------
 
 BOOL _gldChooseInternalPipeline(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLD_driver_dx8 *gld)
 {
 //     return TRUE;    // DEBUGGING: ALWAYS USE MESA
@@ -838,7 +838,7 @@ BOOL _gldChooseInternalPipeline(
 //---------------------------------------------------------------------------
 
 void gld_update_state_DX8(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLuint new_state)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -971,7 +971,7 @@ void gld_update_state_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Viewport_DX8(
-       GLcontext *ctx,
+       struct gl_context *ctx,
        GLint x,
        GLint y,
        GLsizei w,
@@ -1033,12 +1033,12 @@ void gld_Viewport_DX8(
 
 //---------------------------------------------------------------------------
 
-extern BOOL dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 // Mesa 5: Parameter change
 void gldResizeBuffers_DX8(
-//     GLcontext *ctx)
-       GLframebuffer *fb)
+//     struct gl_context *ctx)
+       struct gl_framebuffer *fb)
 {
        GET_CURRENT_CONTEXT(ctx);
        dglWglResizeBuffers(ctx, TRUE);
@@ -1049,7 +1049,7 @@ void gldResizeBuffers_DX8(
 // 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)
 {
@@ -1062,10 +1062,10 @@ void gld_Enable(
 // Driver pointer setup
 //---------------------------------------------------------------------------
 
-extern const GLubyte* _gldGetStringGeneric(GLcontext*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);
 
 void gldSetupDriverPointers_DX8(
-       GLcontext *ctx)
+       struct gl_context *ctx)
 {
        GLD_context             *gldCtx = GLD_GET_CONTEXT(ctx);
        GLD_driver_dx8  *gld    = GLD_GET_DX8_DRIVER(gldCtx);