diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-27 15:15:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-27 15:15:06 +0200 |
| commit | 24703f26d8ed55b1971aa2e94d33636e871bff0b (patch) | |
| tree | 3e57b600f4446a1db1d8e73cb8a83519570eb678 /mesalib/src/mesa/state_tracker | |
| parent | 94ef26cb962261d0b47daf7ef3c856510999bd4c (diff) | |
| parent | 2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff) | |
| download | vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.gz vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.bz2 vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman xkeyboard-config git update 27 sep 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 4f4fe77da..5634a3e6e 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -1379,6 +1379,11 @@ st_TestProxyTexImage(struct gl_context *ctx, GLenum target, struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; + if (width == 0 || height == 0 || depth == 0) { + /* zero-sized images are legal, and always fit! */ + return GL_TRUE; + } + if (pipe->screen->can_create_resource) { /* Ask the gallium driver if the texture is too large */ struct gl_texture_object *texObj = |