diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-08-04 16:38:57 +0200 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2010-08-05 01:48:14 +0200 |
commit | bc578caefb29cb9d1720d51698e2cd23ee490c44 (patch) | |
tree | b2b097c4820a6b14920220a8b130efd63f667199 /src/mesa/drivers | |
parent | d03f04bfb57cb7b5537cb31f1dc798a6ba500f36 (diff) |
dri/nouveau: Don't try to validate uninitialized teximages.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 79b6757586..442f4e899e 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -183,10 +183,10 @@ teximage_fits(struct gl_texture_object *t, int level) struct nouveau_surface *s = &to_nouveau_texture(t)->surfaces[level]; struct gl_texture_image *ti = t->Image[0][level]; - return ti && (t->Target == GL_TEXTURE_RECTANGLE || - (s->bo && s->width == ti->Width && - s->height == ti->Height && - s->format == ti->TexFormat)); + return ti && to_nouveau_teximage(ti)->surface.bo && + (t->Target == GL_TEXTURE_RECTANGLE || + (s->bo && s->format == ti->TexFormat && + s->width == ti->Width && s->height == ti->Height)); } static GLboolean |