diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
| commit | 03ec66375889f049b09f39ba98515aa35ac48164 (patch) | |
| tree | e149d8defb52b1252af982b459902ee0800b17cd /src/mesa/state_tracker/st_cb_texture.c | |
| parent | bd4fe0e87c1b979973d9a76aa48de5fbbb8d52b7 (diff) | |
| parent | 2366bb1baf2e9ae5b6ecf19f66ae9e0a4b0d2f36 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 1ba3173312..d4731c7737 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -529,7 +529,8 @@ st_TexImage(GLcontext * ctx, texImage->RowStride = postConvWidth; } - assert(texImage->RowStride == postConvWidth); + /* we'll set RowStride elsewhere when the texture is a "mapped" state */ + /*assert(texImage->RowStride == postConvWidth);*/ } /* Release the reference to a potentially orphaned buffer. |