summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:34:57 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:34:57 -0700
commit20374b6045fdce69d0d6b7f29e3bc3a445455698 (patch)
treeec83a9b2a4d8d32b4ef5307c90b7b50b7f2cc4ba /opengl
parent4e8a2ddf4be45b3cfcda844f3c423967c333515d (diff)
parent77dcdc9cda8ce572cc8bfdb0490985fafbec6473 (diff)
downloadframeworks_base-20374b6045fdce69d0d6b7f29e3bc3a445455698.zip
frameworks_base-20374b6045fdce69d0d6b7f29e3bc3a445455698.tar.gz
frameworks_base-20374b6045fdce69d0d6b7f29e3bc3a445455698.tar.bz2
merge from open-source master
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libagl/egl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index b6e0aae..79c5ecb 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -485,13 +485,13 @@ void egl_window_surface_v2_t::copyBlt(
copybit_device_t* const copybit = blitengine;
if (copybit) {
copybit_image_t simg;
- simg.w = src->width;
+ simg.w = src->stride;
simg.h = src->height;
simg.format = src->format;
simg.handle = const_cast<native_handle_t*>(src->handle);
copybit_image_t dimg;
- dimg.w = dst->width;
+ dimg.w = dst->stride;
dimg.h = dst->height;
dimg.format = dst->format;
dimg.handle = const_cast<native_handle_t*>(dst->handle);