diff options
| -rw-r--r-- | src/glx/tests/indirect_api.cpp | 8 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_framebuffer_object.xml | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/EXT_framebuffer_object.xml | 6 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 6 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 4 |
6 files changed, 36 insertions, 6 deletions
diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp index 4291c965bd..52469a771c 100644 --- a/src/glx/tests/indirect_api.cpp +++ b/src/glx/tests/indirect_api.cpp @@ -683,6 +683,8 @@ void __indirect_glProgramNamedParameter4dvNV(void) { } void __indirect_glProgramNamedParameter4fNV(void) { } void __indirect_glProgramNamedParameter4fvNV(void) { } void __indirect_glBlendEquationSeparate(void) { } +void __indirect_glBindFramebufferEXT(void) { } +void __indirect_glBindRenderbufferEXT(void) { } void __indirect_glBindFramebuffer(void) { } void __indirect_glBindRenderbuffer(void) { } void __indirect_glCheckFramebufferStatus(void) { } @@ -1488,8 +1490,10 @@ TEST_F(IndirectAPI, EXT_blend_equation_separate) TEST_F(IndirectAPI, EXT_framebuffer_object) { - EXPECT_EQ((_glapi_proc) __indirect_glBindFramebuffer, table[_glapi_get_proc_offset("glBindFramebufferEXT")]); - EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbuffer, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindFramebufferEXT, table[_glapi_get_proc_offset("glBindFramebufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbufferEXT, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindFramebuffer, table[_glapi_get_proc_offset("glBindFramebuffer")]); + EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbuffer, table[_glapi_get_proc_offset("glBindRenderbuffer")]); EXPECT_EQ((_glapi_proc) __indirect_glCheckFramebufferStatus, table[_glapi_get_proc_offset("glCheckFramebufferStatusEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glDeleteFramebuffers, table[_glapi_get_proc_offset("glDeleteFramebuffersEXT")]); EXPECT_EQ((_glapi_proc) __indirect_glDeleteRenderbuffers, table[_glapi_get_proc_offset("glDeleteRenderbuffersEXT")]); diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 87eda93eb5..7c547c1674 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -149,7 +149,7 @@ <function name="BindRenderbuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4316"/> + <glx rop="235"/> </function> <function name="DeleteRenderbuffers" @@ -199,7 +199,7 @@ <function name="BindFramebuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> - <glx rop="4319"/> + <glx rop="236"/> </function> <function name="DeleteFramebuffers" diff --git a/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/src/mapi/glapi/gen/EXT_framebuffer_object.xml index 85a05f6eda..16c82a4a2c 100644 --- a/src/mapi/glapi/gen/EXT_framebuffer_object.xml +++ b/src/mapi/glapi/gen/EXT_framebuffer_object.xml @@ -78,9 +78,10 @@ <return type="GLboolean"/> </function> - <function name="BindRenderbufferEXT" alias="BindRenderbuffer"> + <function name="BindRenderbufferEXT" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4316"/> </function> <function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers"> @@ -111,9 +112,10 @@ <return type="GLboolean"/> </function> - <function name="BindFramebufferEXT" alias="BindFramebuffer"> + <function name="BindFramebufferEXT" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> + <glx rop="4319"/> </function> <function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers"> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index f59fdb12d0..a29f1ab13c 100644 --- a/src/mesa/main/fbobject.c +++ b/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/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index 4066ea65b1..0a2a5cc59a 100644 --- a/src/mesa/main/fbobject.h +++ b/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/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 8d3774775f..34e0742655 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -527,6 +527,10 @@ const struct function gl_core_functions_possible[] = { { "glEGLImageTargetRenderbufferStorageOES", 31, -1 }, { "glEGLImageTargetTexture2DOES", 31, -1 }, + /* GL_EXT_framebuffer_object */ + { "glBindFramebufferEXT", 31, -1 }, + { "glBindRenderbufferEXT", 31, -1 }, + /* GL 3.2 */ { "glGetInteger64i_v", 32, -1 }, { "glGetBufferParameteri64v", 32, -1 }, |