Mesa (openchrome-branch): openchrome: Fix some compilation errors / warnings.

[Thomas Hellstrom]

Module: Mesa
Branch: openchrome-branch
Commit: b6e6b2c45d2e972a2d9a09e357f531a902ddbb92
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6e6b2c45d2e972a2d9a09e357f531a902ddbb92

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Fri Jul 24 10:46:10 2009 +0200

openchrome: Fix some compilation errors / warnings.

Some reported by Rafal Milecki.

---

 src/mesa/drivers/dri/openchrome/via_fbo.c |    4 ----
 src/mesa/drivers/dri/openchrome/via_tex.c |    1 +
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/openchrome/via_fbo.c b/src/mesa/drivers/dri/openchrome/via_fbo.c
index cc02edb..8478342 100644
--- a/src/mesa/drivers/dri/openchrome/via_fbo.c
+++ b/src/mesa/drivers/dri/openchrome/via_fbo.c
@@ -502,9 +502,6 @@ via_alloc_texture_wrapper(void)
     struct via_renderbuffer *viarb;
     const GLuint name = ~0;
 
-    ASSERT(att->Type == GL_TEXTURE);
-    ASSERT(att->Renderbuffer == NULL);
-
     viarb = CALLOC_STRUCT(via_renderbuffer);
     if (!viarb) {
 	return NULL;
@@ -644,7 +641,6 @@ via_render_texture(GLcontext * ctx,
 	= att->Texture->Image[att->CubeMapFace][att->TextureLevel];
     struct gl_texture_object *newObj = newImage->TexObject;
     struct via_renderbuffer *viarb = via_renderbuffer(att->Renderbuffer);
-    struct via_texture_image *via_image;
 
     ASSERT(newImage);
 
diff --git a/src/mesa/drivers/dri/openchrome/via_tex.c b/src/mesa/drivers/dri/openchrome/via_tex.c
index 5b59962..a955bda 100644
--- a/src/mesa/drivers/dri/openchrome/via_tex.c
+++ b/src/mesa/drivers/dri/openchrome/via_tex.c
@@ -40,6 +40,7 @@
 #include "main/texobj.h"
 #include "main/texstore.h"
 #include "main/teximage.h"
+#include "main/texgetimage.h"
 #include "swrast/swrast.h"
 
 #include "via_context.h"