diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /src/mesa/glapi/gl_API.xml | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'src/mesa/glapi/gl_API.xml')
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index 8212fc2477..cc3e3ae6bf 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -11681,6 +11681,56 @@ <enum name="DEPTH_STENCIL_TO_BGRA_NV" value="0x886F"/> </category> +<category name="GL_ATI_envmap_bumpmap" number="244"> + <enum name="BUMP_ROT_MATRIX_ATI" count="4" value="0x8775"> + <size name="TexBumpParameterfv"/> + <size name="TexBumpParameteriv"/> + <size name="GetTexBumpParameterfv" mode="get"/> + <size name="GetTexBumpParameteriv" mode="get"/> + </enum> + <enum name="BUMP_ROT_MATRIX_SIZE_ATI" count="1" value="0x8776"> + <size name="GetTexBumpParameterfv" mode="get"/> + <size name="GetTexBumpParameteriv" mode="get"/> + </enum> + <enum name="BUMP_NUM_TEX_UNITS_ATI" count="1" value="0x8777"> + <size name="GetTexBumpParameterfv" mode="get"/> + <size name="GetTexBumpParameteriv" mode="get"/> + </enum> + <enum name="BUMP_TEX_UNITS_ATI" count="-1" value="0x8778"> + <size name="GetTexBumpParameterfv" mode="get"/> + <size name="GetTexBumpParameteriv" mode="get"/> + </enum> + <enum name="DUDV_ATI" value="0x8779"/> + <enum name="DU8DV8_ATI" value="0x877A"/> + <enum name="BUMP_ENVMAP_ATI" value="0x877B"/> + <enum name="BUMP_TARGET_ATI" count="1" value="0x877C"> + <size name="TexEnviv"/> + <size name="TexEnvfv"/> + <size name="GetTexEnviv" mode="get"/> + <size name="GetTexEnvfv" mode="get"/> + </enum> + <function name="TexBumpParameterfvATI" offset="assign"> + <param name="pname" type="GLenum"/> + <param name="param" type="const GLfloat *" variable_param="pname"/> + <glx ignore="true"/> + </function> + <function name="TexBumpParameterivATI" offset="assign"> + <param name="pname" type="GLenum"/> + <param name="param" type="const GLint *" variable_param="pname"/> + <glx ignore="true"/> + </function> + <function name="GetTexBumpParameterfvATI" offset="assign"> + <param name="pname" type="GLenum"/> + <param name="param" type="GLfloat *" variable_param="pname"/> + <glx ignore="true"/> + </function> + <function name="GetTexBumpParameterivATI" offset="assign"> + <param name="pname" type="GLenum"/> + <param name="param" type="GLint *" variable_param="pname"/> + <glx ignore="true"/> + </function> +</category> + <category name="GL_ATI_fragment_shader" number="245"> <function name="GenFragmentShadersATI" offset="assign"> <return type="GLuint"/> |