summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2009-07-24 10:46:10 +0200
committerThomas Hellstrom <thellstrom@vmware.com>2009-07-24 10:46:10 +0200
commitb6e6b2c45d2e972a2d9a09e357f531a902ddbb92 (patch)
tree88d46bb334f3c6b545f008d433e5e6de7cb74e7e
parent3b15ff43d96dd3042669fe7448774cf986684ee3 (diff)
openchrome: Fix some compilation errors / warnings.openchrome-branch
Some reported by Rafal Milecki.
-rw-r--r--src/mesa/drivers/dri/openchrome/via_fbo.c4
-rw-r--r--src/mesa/drivers/dri/openchrome/via_tex.c1
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 cc02edb30da..84783426f42 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 5b599627618..a955bdac571 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"