diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /mesalib/src/mapi/glapi/glapi_gentable.c | |
parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi_gentable.c')
-rw-r--r-- | mesalib/src/mapi/glapi/glapi_gentable.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c index e4f75fe7b..cc083d985 100644 --- a/mesalib/src/mapi/glapi/glapi_gentable.c +++ b/mesalib/src/mapi/glapi/glapi_gentable.c @@ -3811,13 +3811,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { } - if(!disp->TexBuffer) { - void ** procp = (void **) &disp->TexBuffer; - snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix); - *procp = dlsym(handle, symboln); - } - - if(!disp->FramebufferTexture) { void ** procp = (void **) &disp->FramebufferTexture; snprintf(symboln, sizeof(symboln), "%sFramebufferTexture", symbol_prefix); @@ -5659,6 +5652,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { } + if(!disp->TexBufferARB) { + void ** procp = (void **) &disp->TexBufferARB; + snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix); + *procp = dlsym(handle, symboln); + } + + if(!disp->BindVertexArray) { void ** procp = (void **) &disp->BindVertexArray; snprintf(symboln, sizeof(symboln), "%sBindVertexArray", symbol_prefix); |