diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
| commit | 45b71fd5b777a968310c537ace5efcd1443085a0 (patch) | |
| tree | a3ef2b449659c3ba6c885d169c7796b3ef948867 /mesalib/src/mapi | |
| parent | 08bafbbe05abefabdb0c3238c3d9ecdcce1b692f (diff) | |
| parent | 89bc3ee988b62eb5e10284bac32a176955546410 (diff) | |
| download | vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.gz vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.bz2 vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkbcomp git update 19 Jul 2013
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml | 4 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 87eda93eb..7c547c167 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -149,7 +149,7 @@ <function name="BindRenderbuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4316"/> + <glx rop="235"/> </function> <function name="DeleteRenderbuffers" @@ -199,7 +199,7 @@ <function name="BindFramebuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> - <glx rop="4319"/> + <glx rop="236"/> </function> <function name="DeleteFramebuffers" diff --git a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml index 85a05f6ed..16c82a4a2 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml @@ -78,9 +78,10 @@ <return type="GLboolean"/> </function> - <function name="BindRenderbufferEXT" alias="BindRenderbuffer"> + <function name="BindRenderbufferEXT" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4316"/> </function> <function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers"> @@ -111,9 +112,10 @@ <return type="GLboolean"/> </function> - <function name="BindFramebufferEXT" alias="BindFramebuffer"> + <function name="BindFramebufferEXT" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> + <glx rop="4319"/> </function> <function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers"> |