diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
| commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
| tree | 932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mapi/glapi/gen/gl_API.xml | |
| parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/gl_API.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_API.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 3c13591ca..932528258 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -2981,7 +2981,6 @@ <enum name="POLYGON_OFFSET_FACTOR" count="1" value="0x8038"> <size name="Get" mode="get"/> </enum> - <enum name="POLYGON_OFFSET_BIAS" value="0x8039"/> <enum name="ALPHA4" value="0x803B"/> <enum name="ALPHA8" value="0x803C"/> <enum name="ALPHA12" value="0x803D"/> @@ -8089,6 +8088,8 @@ </category> <category name="GL_EXT_polygon_offset" number="3"> + <enum name="POLYGON_OFFSET_BIAS_EXT" value="0x8039"/> + <function name="PolygonOffsetEXT" offset="assign"> <param name="factor" type="GLfloat"/> <param name="bias" type="GLfloat"/> |