diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-15 15:08:38 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-15 15:08:38 +0000 |
| commit | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (patch) | |
| tree | 6327d3e449dfe53ad6ee6125290581aae6f5ed35 /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
| parent | 898081f31f99dc35a1602a607a07d1aaff49ac40 (diff) | |
| parent | 71372d36e1a3f0230b88808f70d35446fda12260 (diff) | |
| download | vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.tar.gz vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.tar.bz2 vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 6223733d3..0dc61bba9 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -600,7 +600,12 @@ st_TexImage(struct gl_context * ctx, * memory or malloc space for it.
*/
if (stImage->pt) {
- /* Store the image in the gallium texture memory buffer */
+ if (!pixels) {
+ /* We've allocated texture resource, but have no pixel data - all done. */
+ goto done;
+ }
+
+ /* Store the image in the gallium transfer object */
if (format == GL_DEPTH_COMPONENT &&
util_format_is_depth_and_stencil(stImage->pt->format))
transfer_usage = PIPE_TRANSFER_READ_WRITE;
|