Lots of changes/fixes for rendering to framebuffer objects.

- When deleting texture objects, unbind from FBOs if necessary.
- Changed driver hooks for starting/ending render to texture.
- Now properly handle case where gl[Copy]TexImage() is called after
  glFramebufferTexture[123]D().  That didn't work before.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 6af304fe26..4b2764979d 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -808,12 +808,10 @@ struct dd_function_table {
                                    GLenum attachment,
                                    struct gl_renderbuffer *rb);
    void (*RenderbufferTexture)(GLcontext *ctx,
-                               struct gl_renderbuffer_attachment *att,
-                               struct gl_texture_object *texObj,
-                               GLenum texTarget, GLuint level, GLuint zoffset);
+                               struct gl_framebuffer *fb,
+                               struct gl_renderbuffer_attachment *att);
    void (*FinishRenderTexture)(GLcontext *ctx,
-                               struct gl_texture_object *texObj,
-                               GLuint face, GLuint level);
+                               struct gl_renderbuffer_attachment *att);
    /*@}*/
 #endif
 #if FEATURE_EXT_framebuffer_blit