diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /src/mapi/glapi/gen | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'src/mapi/glapi/gen')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 5cf216c91f..d391895f87 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -9384,13 +9384,13 @@ <size name="CullParameterdv"/> </enum> - <function name="CullParameterdvEXT" offset="assign" static_dispatch="false"> + <function name="CullParameterdvEXT"> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> </function> - <function name="CullParameterfvEXT" offset="assign" static_dispatch="false"> + <function name="CullParameterfvEXT"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *"/> <!-- Spec bug. Should be const. --> <glx ignore="true"/> |