diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
| commit | 8285341e69cd721c6871b553e45437c767200545 (patch) | |
| tree | 551508bddc84d1c16c15d961878cd2d2f6edb365 /mesalib/src/mapi/glapi/glapi_x86.S | |
| parent | 52b8618bfdaa4725fc403f50fe682d02e7f16435 (diff) | |
| parent | 5e633abcca598289d0423d89bb400b41e6417259 (diff) | |
| download | vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.gz vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.bz2 vcxsrv-8285341e69cd721c6871b553e45437c767200545.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi_x86.S')
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi_x86.S | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_x86.S b/mesalib/src/mapi/glapi/glapi_x86.S index 6246e660f..143471164 100644 --- a/mesalib/src/mapi/glapi/glapi_x86.S +++ b/mesalib/src/mapi/glapi/glapi_x86.S @@ -1064,18 +1064,19 @@ GLNAME(gl_dispatch_functions_start): GL_STUB(ActiveProgramEXT, 881, ActiveProgramEXT@4)
GL_STUB(CreateShaderProgramEXT, 882, CreateShaderProgramEXT@8)
GL_STUB(UseShaderProgramEXT, 883, UseShaderProgramEXT@8)
- GL_STUB(_dispatch_stub_884, 884, _dispatch_stub_884@16)
- HIDDEN(GL_PREFIX(_dispatch_stub_884, _dispatch_stub_884@16))
+ GL_STUB(TextureBarrierNV, 884, TextureBarrierNV@0)
GL_STUB(_dispatch_stub_885, 885, _dispatch_stub_885@16)
HIDDEN(GL_PREFIX(_dispatch_stub_885, _dispatch_stub_885@16))
GL_STUB(_dispatch_stub_886, 886, _dispatch_stub_886@16)
HIDDEN(GL_PREFIX(_dispatch_stub_886, _dispatch_stub_886@16))
- GL_STUB(_dispatch_stub_887, 887, _dispatch_stub_887@12)
- HIDDEN(GL_PREFIX(_dispatch_stub_887, _dispatch_stub_887@12))
+ GL_STUB(_dispatch_stub_887, 887, _dispatch_stub_887@16)
+ HIDDEN(GL_PREFIX(_dispatch_stub_887, _dispatch_stub_887@16))
GL_STUB(_dispatch_stub_888, 888, _dispatch_stub_888@12)
HIDDEN(GL_PREFIX(_dispatch_stub_888, _dispatch_stub_888@12))
- GL_STUB(EGLImageTargetRenderbufferStorageOES, 889, EGLImageTargetRenderbufferStorageOES@8)
- GL_STUB(EGLImageTargetTexture2DOES, 890, EGLImageTargetTexture2DOES@8)
+ GL_STUB(_dispatch_stub_889, 889, _dispatch_stub_889@12)
+ HIDDEN(GL_PREFIX(_dispatch_stub_889, _dispatch_stub_889@12))
+ GL_STUB(EGLImageTargetRenderbufferStorageOES, 890, EGLImageTargetRenderbufferStorageOES@8)
+ GL_STUB(EGLImageTargetTexture2DOES, 891, EGLImageTargetTexture2DOES@8)
GL_STUB_ALIAS(ArrayElementEXT, 306, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
GL_STUB_ALIAS(BindTextureEXT, 307, BindTextureEXT@8, BindTexture, BindTexture@8)
GL_STUB_ALIAS(DrawArraysEXT, 310, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
|