Mesa (master): mesa: remove unimplemented FramebufferTextureARB

Jordan Justen jljusten at kemper.freedesktop.org
Sat Nov 3 18:17:41 UTC 2012


Module: Mesa
Branch: master
Commit: f625cb580a14ce6fedd62f98bb7437c167a11c76
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f625cb580a14ce6fedd62f98bb7437c167a11c76

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Oct 29 10:45:44 2012 -0700

mesa: remove unimplemented FramebufferTextureARB

This function can be re-added with an actual implementation
when ARB_geometry_shader4 is supported.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/mesa/main/api_exec.c |    1 -
 src/mesa/main/fbobject.c |   11 -----------
 src/mesa/main/fbobject.h |    4 ----
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 8f9672a..d9c306f 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -788,7 +788,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_FramebufferTexture(exec, _mesa_FramebufferTextureARB);
       SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);
    }
 
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 9cde52a..078e832 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3056,17 +3056,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
 
 
 void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glFramebufferTextureARB "
-               "not implemented!");
-}
-
-
-void GLAPIENTRY
 _mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
                                 GLuint texture, GLint level, GLenum face)
 {
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 9cded3c..5b72416 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -206,10 +206,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLbitfield mask, GLenum filter);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level);
-
-extern void GLAPIENTRY
 _mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
                                 GLuint texture, GLint level, GLenum face);
 




More information about the mesa-commit mailing list