summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-02-22 02:03:42 +0100
committerFrancisco Jerez <currojerez@riseup.net>2010-02-25 18:37:36 +0100
commit323e6bbb052f37f91c7340e16c2352bb780a43d8 (patch)
tree3d201e2c1ee27fd3db41c5d42ac445f8d9b6bbf8 /src/mesa/drivers/dri/nouveau/nv04_state_tex.c
parent44602bb23ca7b67d4db586d9194c75cfe4a60962 (diff)
dri/nouveau: Try to validate textures earlier.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv04_state_tex.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv04_state_tex.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
index 99ea310c65..684a19e703 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
@@ -89,7 +89,9 @@ nv04_emit_tex_obj(GLcontext *ctx, int emit)
struct gl_texture_image *ti = t->Image[0][t->BaseLevel];
int lod_max = 1, lod_bias = 0;
- nouveau_texture_validate(ctx, t);
+ if (!nouveau_texture_validate(ctx, t))
+ return;
+
s = &to_nouveau_texture(t)->surfaces[t->BaseLevel];
if (t->MinFilter != GL_NEAREST &&