diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
| commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
| tree | 18dc73394bd3921415b57b5847f03a9753374e99 /mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml | |
| parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml index d9e540fc9..97a4e2e8f 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -27,12 +27,12 @@ <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_ARB" value="0x8DA7"/> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER" value="0x8CD4"/> <enum name="PROGRAM_POINT_SIZE_ARB" value="0x8642"/> - <function name="ProgramParameteriARB" offset="assign"> + <function name="ProgramParameteriARB" alias="ProgramParameteri"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> </function> - <function name="FramebufferTextureARB" offset="assign"> + <function name="FramebufferTextureARB" alias="FramebufferTexture"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> |