Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Id09376d1 into eclair

Browse Source 
* changes:
  fix [2071412] work around mdp 32-bits fade limitation
This commit is contained in:
Android (Google) Code Review
2009-11-09 19:32:47 -08:00
parent 11cff8cd30 d09376d1e2
commit c421fc2ada
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
opengl/libagl/copybit.cpp
View File

@@ -388,14 +388,33 @@ static bool copybit(GLint x, GLint y,
copybit_image_t tmpCbImg; copybit_image_t tmpCbImg;
copybit_rect_t tmpCbRect; copybit_rect_t tmpCbRect;
copybit_rect_t tmpdrect = drect;
tmpCbImg.w = w; tmpCbImg.w = w;
tmpCbImg.h = h; tmpCbImg.h = h;
tmpCbImg.format = tempCb->format; tmpCbImg.format = tempCb->format;
tmpCbImg.handle = (native_handle_t*)tempCb->getNativeBuffer()->handle; tmpCbImg.handle = (native_handle_t*)tempCb->getNativeBuffer()->handle;
tmpCbRect.l = 0; tmpCbRect.l = 0;
tmpCbRect.t = 0; tmpCbRect.t = 0;
tmpCbRect.r = w;
tmpCbRect.b = h; if (drect.l < 0) {
tmpCbRect.l = -tmpdrect.l;
tmpdrect.l = 0;
}
if (drect.t < 0) {
tmpCbRect.t = -tmpdrect.t;
tmpdrect.t = 0;
}
if (drect.l + tmpCbImg.w > dst.w) {
tmpCbImg.w = dst.w - drect.l;
tmpdrect.r = dst.w;
}
if (drect.t + tmpCbImg.h > dst.h) {
tmpCbImg.h = dst.h - drect.t;
tmpdrect.b = dst.h;
}
tmpCbRect.r = tmpCbImg.w;
tmpCbRect.b = tmpCbImg.h;
if (!err) { if (!err) {
// first make a copy of the destination buffer // first make a copy of the destination buffer
@@ -404,7 +423,7 @@ static bool copybit(GLint x, GLint y,
copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, 0xFF); copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, 0xFF);
copybit->set_parameter(copybit, COPYBIT_DITHER, COPYBIT_DISABLE); copybit->set_parameter(copybit, COPYBIT_DITHER, COPYBIT_DISABLE);
err = copybit->stretch(copybit, err = copybit->stretch(copybit,
&tmpCbImg, &dst, &tmpCbRect, &drect, &tmp_it); &tmpCbImg, &dst, &tmpCbRect, &tmpdrect, &tmp_it);
} }
if (!err) { if (!err) {
// then proceed as usual, but without the alpha plane // then proceed as usual, but without the alpha plane
@@ -424,7 +443,7 @@ static bool copybit(GLint x, GLint y,
copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, invPlaneAlpha); copybit->set_parameter(copybit, COPYBIT_PLANE_ALPHA, invPlaneAlpha);
copybit->set_parameter(copybit, COPYBIT_DITHER, COPYBIT_ENABLE); copybit->set_parameter(copybit, COPYBIT_DITHER, COPYBIT_ENABLE);
err = copybit->stretch(copybit, err = copybit->stretch(copybit,
&dst, &tmpCbImg, &drect, &tmpCbRect, &it); &dst, &tmpCbImg, &tmpdrect, &tmpCbRect, &it);
} }
} else { } else {
copybit->set_parameter(copybit, COPYBIT_TRANSFORM, transform); copybit->set_parameter(copybit, COPYBIT_TRANSFORM, transform);