X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnv20_driver.h;h=f2a6097b937b6df212dc2a4789d88db546b61466;hb=da9e6fdfe27065b8ede8b2fe30c8cccc3b573245;hp=2de18ee4af1f280fbfac3878af69062798e72de1;hpb=653a83445f94620673f747a4ace6847a2c7fdb4d;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nv20_driver.h b/src/mesa/drivers/dri/nouveau/nv20_driver.h
index 2de18ee4af1..f2a6097b937 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nv20_driver.h
@@ -34,79 +34,89 @@ enum {
 
 #define NV20_TEXTURE_UNITS 4
 
-/* nv20_screen.c */
-GLboolean
-nv20_screen_init(struct nouveau_screen *screen);
-
 /* nv20_context.c */
-GLcontext *
-nv20_context_create(struct nouveau_screen *screen, const GLvisual *visual,
-		    GLcontext *share_ctx);
+extern const struct nouveau_driver nv20_driver;
 
+/* nv20_render.c */
 void
-nv20_context_destroy(GLcontext *ctx);
+nv20_vbo_init(struct gl_context *ctx);
 
-/* nv20_render.c */
 void
-nv20_render_init(GLcontext *ctx);
+nv20_vbo_destroy(struct gl_context *ctx);
 
 void
-nv20_render_destroy(GLcontext *ctx);
+nv20_swtnl_init(struct gl_context *ctx);
+
+void
+nv20_swtnl_destroy(struct gl_context *ctx);
 
 /* nv20_state_fb.c */
 void
-nv20_emit_framebuffer(GLcontext *ctx, int emit);
+nv20_emit_framebuffer(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_viewport(GLcontext *ctx, int emit);
+nv20_emit_viewport(struct gl_context *ctx, int emit);
 
 /* nv20_state_polygon.c */
 void
-nv20_emit_point_mode(GLcontext *ctx, int emit);
+nv20_emit_point_mode(struct gl_context *ctx, int emit);
 
 /* nv20_state_raster.c */
 void
-nv20_emit_logic_opcode(GLcontext *ctx, int emit);
+nv20_emit_logic_opcode(struct gl_context *ctx, int emit);
+
+/* nv20_state_frag.c */
+void
+nv20_emit_tex_env(struct gl_context *ctx, int emit);
+
+void
+nv20_emit_frag(struct gl_context *ctx, int emit);
 
 /* nv20_state_tex.c */
 void
-nv20_emit_tex_obj(GLcontext *ctx, int emit);
+nv20_emit_tex_gen(struct gl_context *ctx, int emit);
+
+void
+nv20_emit_tex_mat(struct gl_context *ctx, int emit);
+
+void
+nv20_emit_tex_obj(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_tex_shader(GLcontext *ctx, int emit);
+nv20_emit_tex_shader(struct gl_context *ctx, int emit);
 
 /* nv20_state_tnl.c */
 void
-nv20_emit_clip_plane(GLcontext *ctx, int emit);
+nv20_emit_clip_plane(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_color_material(GLcontext *ctx, int emit);
+nv20_emit_color_material(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_fog(GLcontext *ctx, int emit);
+nv20_emit_fog(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_light_model(GLcontext *ctx, int emit);
+nv20_emit_light_model(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_light_source(GLcontext *ctx, int emit);
+nv20_emit_light_source(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_material_ambient(GLcontext *ctx, int emit);
+nv20_emit_material_ambient(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_material_diffuse(GLcontext *ctx, int emit);
+nv20_emit_material_diffuse(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_material_specular(GLcontext *ctx, int emit);
+nv20_emit_material_specular(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_material_shininess(GLcontext *ctx, int emit);
+nv20_emit_material_shininess(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_modelview(GLcontext *ctx, int emit);
+nv20_emit_modelview(struct gl_context *ctx, int emit);
 
 void
-nv20_emit_projection(GLcontext *ctx, int emit);
+nv20_emit_projection(struct gl_context *ctx, int emit);
 
 #endif