diff options
| author | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
| commit | 447dddb93d8dc2551ef7a9c43004237c7a8dd2dd (patch) | |
| tree | de18c6e4c2b071923345bcc1fa876459c4148a70 /src/glx/x11/indirect.h | |
| parent | 9e8ab2e7c1b8ff5279d4247b8690c9bfc57f7e02 (diff) | |
| parent | c574f515f0aa20ccc3841cf61a6124bc5996e7b2 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_shader_build.c
Diffstat (limited to 'src/glx/x11/indirect.h')
| -rw-r--r-- | src/glx/x11/indirect.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h index 0719a1b3024..19a8c0d134a 100644 --- a/src/glx/x11/indirect.h +++ b/src/glx/x11/indirect.h @@ -572,6 +572,7 @@ extern HIDDEN void __indirect_glGetQueryObjectuivARB(GLuint id, GLenum pname, GL extern HIDDEN void __indirect_glGetQueryivARB(GLenum target, GLenum pname, GLint * params); extern HIDDEN GLboolean __indirect_glIsQueryARB(GLuint id); extern HIDDEN void __indirect_glDrawBuffersARB(GLsizei n, const GLenum * bufs); +extern HIDDEN void __indirect_glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); extern HIDDEN void __indirect_glSampleMaskSGIS(GLclampf value, GLboolean invert); extern HIDDEN void __indirect_glSamplePatternSGIS(GLenum pattern); extern HIDDEN void __indirect_glColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); @@ -710,6 +711,8 @@ extern HIDDEN void __indirect_glGetRenderbufferParameterivEXT(GLenum target, GLe extern HIDDEN GLboolean __indirect_glIsFramebufferEXT(GLuint framebuffer); extern HIDDEN GLboolean __indirect_glIsRenderbufferEXT(GLuint renderbuffer); extern HIDDEN void __indirect_glRenderbufferStorageEXT(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); +extern HIDDEN void __indirect_glBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +extern HIDDEN void __indirect_glFramebufferTextureLayerEXT(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); # undef HIDDEN # undef FASTCALL |