diff options
| author | Brian Paul <[email protected]> | 2008-11-11 14:42:41 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-11 14:42:41 -0700 |
| commit | 19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch) | |
| tree | 5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/mesa/glapi/gl_API.xml | |
| parent | 7f3d45758ccbbcff6428d57d26794960e3e9532c (diff) | |
| parent | 90246d3ea54f54d60593dce1b89f0226058a3c56 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/glapi/gl_API.xml')
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index 2d8a967ba79..6c0367aad79 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -3289,7 +3289,7 @@ <param name="textures" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> <return type="GLboolean"/> - <glx sop="143" always_array="true"/> + <glx sop="143" handcode="client" always_array="true"/> </function> <function name="BindTexture" offset="307"> @@ -8645,7 +8645,7 @@ <param name="textures" type="const GLuint *" count="n"/> <param name="residences" type="GLboolean *" output="true" count="n"/> <return type="GLboolean"/> - <glx vendorpriv="11" always_array="true"/> + <glx vendorpriv="11" handcode="client" always_array="true"/> </function> <function name="BindTextureEXT" alias="BindTexture"> |