diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-08-29 14:10:57 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-08-29 15:01:31 +0100 |
| commit | b3f56ccb4858f4f62ee53c74be1a2233bb608cae (patch) | |
| tree | 8cc8c4f14b538cbe178f01028f6032d6a226089f /cogl | |
| parent | 4589c6f15860522dbb256ffb298b395a2e1e421b (diff) | |
| download | cogl-b3f56ccb4858f4f62ee53c74be1a2233bb608cae.tar.gz | |
tex-driver-gles: Fix subregion uploads without GL_EXT_unpack_subimage
When the GL_EXT_unpack_subimage extension is not available and a
subregion of a texture is uploaded then it should first copy the
subregion to a newly allocated bitmap. However it was then later still
trying to prepare the upload using the original src_x and src_y values
which would cause an assertion failure. This patch fixes it to just
reset those to zero if the subregion is first copied.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 6f9a62db6f846f1d76e3ca16d9d8cdadf82a7009)
Diffstat (limited to 'cogl')
| -rw-r--r-- | cogl/driver/gles/cogl-texture-driver-gles.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cogl/driver/gles/cogl-texture-driver-gles.c b/cogl/driver/gles/cogl-texture-driver-gles.c index d4d2b5d0..e19721c8 100644 --- a/cogl/driver/gles/cogl-texture-driver-gles.c +++ b/cogl/driver/gles/cogl-texture-driver-gles.c @@ -206,6 +206,8 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx, src_x, src_y, 0, 0, /* dst_x/y */ width, height); + + src_x = src_y = 0; } else slice_bmp = prepare_bitmap_alignment_for_upload (ctx, source_bmp); |