diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
| commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
| tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /src/mesa/main/light.h | |
| parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
| parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
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 ); |