diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-06 08:15:54 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-06 08:15:54 -0700 |
| commit | 374cf77b2f0f13f9380fb0c9d804222a83bdc2e0 (patch) | |
| tree | 39cfbbcbbbdc9b2d64e4ad134472cf747101dc7b /src/glu | |
| parent | 52d5d25537a9291f7d247211d2881ed56edaca94 (diff) | |
| parent | a8ee35c1c59c23938e0a18b163515acc892ed407 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/sgi/glu.exports | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/src/glu/sgi/glu.exports b/src/glu/sgi/glu.exports index 1d1b6da24fe..aeb72729166 100644 --- a/src/glu/sgi/glu.exports +++ b/src/glu/sgi/glu.exports @@ -57,3 +57,62 @@ gluTessVertex gluUnProject gluUnProject4 + mgluBeginCurve + mgluBeginPolygon + mgluBeginSurface + mgluBeginTrim + mgluBuild1DMipmapLevels + mgluBuild1DMipmaps + mgluBuild2DMipmapLevels + mgluBuild2DMipmaps + mgluBuild3DMipmapLevels + mgluBuild3DMipmaps + mgluCheckExtension + mgluCylinder + mgluDeleteNurbsRenderer + mgluDeleteQuadric + mgluDeleteTess + mgluDisk + mgluEndCurve + mgluEndPolygon + mgluEndSurface + mgluEndTrim + mgluErrorString + mgluGetNurbsProperty + mgluGetString + mgluGetTessProperty + mgluLoadSamplingMatrices + mgluLookAt + mgluNewNurbsRenderer + mgluNewQuadric + mgluNewTess + mgluNextContour + mgluNurbsCallback + mgluNurbsCallbackData + mgluNurbsCallbackDataEXT + mgluNurbsCurve + mgluNurbsProperty + mgluNurbsSurface + mgluOrtho2D + mgluPartialDisk + mgluPerspective + mgluPickMatrix + mgluProject + mgluPwlCurve + mgluQuadricCallback + mgluQuadricDrawStyle + mgluQuadricNormals + mgluQuadricOrientation + mgluQuadricTexture + mgluScaleImage + mgluSphere + mgluTessBeginContour + mgluTessBeginPolygon + mgluTessCallback + mgluTessEndContour + mgluTessEndPolygon + mgluTessNormal + mgluTessProperty + mgluTessVertex + mgluUnProject + mgluUnProject4 |