diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
| commit | 45b71fd5b777a968310c537ace5efcd1443085a0 (patch) | |
| tree | a3ef2b449659c3ba6c885d169c7796b3ef948867 /mesalib/src/mesa/main | |
| parent | 08bafbbe05abefabdb0c3238c3d9ecdcce1b692f (diff) | |
| parent | 89bc3ee988b62eb5e10284bac32a176955546410 (diff) | |
| download | vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.gz vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.bz2 vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkbcomp git update 19 Jul 2013
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 14 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.h | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 8 |
3 files changed, 24 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index f59fdb12d..a29f1ab13 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -1155,6 +1155,13 @@ _mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer) } +void GLAPIENTRY +_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer) +{ + _mesa_BindRenderbuffer(target, renderbuffer); +} + + /** * If the given renderbuffer is anywhere attached to the framebuffer, detach * the renderbuffer. @@ -2025,6 +2032,13 @@ _mesa_BindFramebuffer(GLenum target, GLuint framebuffer) } } +void GLAPIENTRY +_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) +{ + _mesa_BindFramebuffer(target, framebuffer); +} + + void GLAPIENTRY _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h index 4066ea65b..0a2a5cc59 100644 --- a/mesalib/src/mesa/main/fbobject.h +++ b/mesalib/src/mesa/main/fbobject.h @@ -120,6 +120,9 @@ extern void GLAPIENTRY _mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer); extern void GLAPIENTRY +_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer); + +extern void GLAPIENTRY _mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers); extern void GLAPIENTRY @@ -152,6 +155,9 @@ extern void GLAPIENTRY _mesa_BindFramebuffer(GLenum target, GLuint framebuffer); extern void GLAPIENTRY +_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer); + +extern void GLAPIENTRY _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers); extern void GLAPIENTRY diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index ea139ea58..aba7d845b 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -3283,7 +3283,7 @@ enum mesa_debug_source { MESA_DEBUG_SOURCE_THIRD_PARTY, MESA_DEBUG_SOURCE_APPLICATION, MESA_DEBUG_SOURCE_OTHER, - MESA_DEBUG_SOURCE_COUNT, + MESA_DEBUG_SOURCE_COUNT }; enum mesa_debug_type { @@ -3293,14 +3293,14 @@ enum mesa_debug_type { MESA_DEBUG_TYPE_PORTABILITY, MESA_DEBUG_TYPE_PERFORMANCE, MESA_DEBUG_TYPE_OTHER, - MESA_DEBUG_TYPE_COUNT, + MESA_DEBUG_TYPE_COUNT }; enum mesa_debug_severity { MESA_DEBUG_SEVERITY_LOW, MESA_DEBUG_SEVERITY_MEDIUM, MESA_DEBUG_SEVERITY_HIGH, - MESA_DEBUG_SEVERITY_COUNT, + MESA_DEBUG_SEVERITY_COUNT }; /** @} */ @@ -3353,7 +3353,7 @@ typedef enum API_OPENGLES, API_OPENGLES2, API_OPENGL_CORE, - API_OPENGL_LAST = API_OPENGL_CORE, + API_OPENGL_LAST = API_OPENGL_CORE } gl_api; /** |