mesa: Use u_math.h from macros.h

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_driver.h

diff --git a/src/mesa/drivers/dri/nouveau/nv04_driver.h b/src/mesa/drivers/dri/nouveau/nv04_driver.h
index 00668710accd40b332e03b5fe0752a95fd5dcf63..554914d1c3077c7d63c0841fdfd59995469ae2fa 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nv04_driver.h
@@ -37,61 +37,57 @@ enum {
 
 #define NV04_TEXTURE_UNITS 2
 
-/* nv04_screen.c */
-GLboolean
-nv04_screen_init(struct nouveau_screen *screen);
-
 /* nv04_render.c */
 void
-nv04_render_init(GLcontext *ctx);
+nv04_render_init(struct gl_context *ctx);
 
 void
-nv04_render_destroy(GLcontext *ctx);
+nv04_render_destroy(struct gl_context *ctx);
 
 /* nv04_surface.c */
 GLboolean
-nv04_surface_init(struct nouveau_screen *screen);
+nv04_surface_init(struct gl_context *ctx);
 
 void
-nv04_surface_takedown(struct nouveau_screen *screen);
+nv04_surface_takedown(struct gl_context *ctx);
 
 void
-nv04_surface_copy(GLcontext *ctx,
+nv04_surface_copy(struct gl_context *ctx,
                  struct nouveau_surface *dst, struct nouveau_surface *src,
                  int dx, int dy, int sx, int sy, int w, int h);
 
 void
-nv04_surface_fill(GLcontext *ctx,
+nv04_surface_fill(struct gl_context *ctx,
                  struct nouveau_surface *dst,
                  unsigned mask, unsigned value,
                  int dx, int dy, int w, int h);
 
 /* nv04_state_fb.c */
 void
-nv04_emit_framebuffer(GLcontext *ctx, int emit);
+nv04_emit_framebuffer(struct gl_context *ctx, int emit);
 
 void
-nv04_emit_scissor(GLcontext *ctx, int emit);
+nv04_emit_scissor(struct gl_context *ctx, int emit);
 
 /* nv04_state_raster.c */
 void
-nv04_defer_control(GLcontext *ctx, int emit);
+nv04_defer_control(struct gl_context *ctx, int emit);
 
 void
-nv04_emit_control(GLcontext *ctx, int emit);
+nv04_emit_control(struct gl_context *ctx, int emit);
 
 void
-nv04_defer_blend(GLcontext *ctx, int emit);
+nv04_defer_blend(struct gl_context *ctx, int emit);
 
 void
-nv04_emit_blend(GLcontext *ctx, int emit);
+nv04_emit_blend(struct gl_context *ctx, int emit);
 
 /* nv04_state_frag.c */
 void
-nv04_emit_tex_env(GLcontext *ctx, int emit);
+nv04_emit_tex_env(struct gl_context *ctx, int emit);
 
 /* nv04_state_tex.c */
 void
-nv04_emit_tex_obj(GLcontext *ctx, int emit);
+nv04_emit_tex_obj(struct gl_context *ctx, int emit);
 
 #endif