diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-19 09:15:34 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-19 09:15:34 -0600 |
| commit | 9038b6c8bbda49c544d777c7cf7b107887421c77 (patch) | |
| tree | 7cfbf496dbc029ca134ede4669511cd6e94ef85a /src/mesa/main/light.h | |
| parent | 0342229289c3bd5ed7bc595db4fc88003430209e (diff) | |
| parent | 0ddc4dbe43422211e6f3fb3278e7b2f55a25976b (diff) | |
Merge branch 'ext-provoking-vertex'
Conflicts:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
Diffstat (limited to 'src/mesa/main/light.h')
| -rw-r--r-- | src/mesa/main/light.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index b97e17b5be..9c1a5eefad 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -1,13 +1,9 @@ -/** - * \file light.h - * Lighting. - */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 7.5 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. + * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -37,6 +33,10 @@ extern void GLAPIENTRY _mesa_ShadeModel( GLenum mode ); +extern void GLAPIENTRY +_mesa_ProvokingVertexEXT(GLenum mode); + + #if _HAVE_FULL_GL extern void GLAPIENTRY _mesa_ColorMaterial( GLenum face, GLenum mode ); |