ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev

Browse Source
This commit is contained in:
Jesse Hall 2012-07-31 12:24:16 -07:00 committed by Android (Google) Code Review
commit b6ae16f04e
8 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opengl/tests/hwc/hwcColorEquiv.cpp
View File

@ -344,9 +344,9 @@ main(int argc, char *argv[])
hwcTestFillColorHBlend(equivFrame.get(), refFormat->format,
startRefColor, endRefColor);
hwc_display_contents_1_t *list;
size_t size = sizeof(hwc_display_contents_1_t) + numFrames * sizeof(hwc_layer_1_t);
if ((list = (hwc_display_contents_1_t *) calloc(1, size)) == NULL) {
hwc_layer_list_1_t *list;
size_t size = sizeof(hwc_layer_list_1_t) + numFrames * sizeof(hwc_layer_1_t);
if ((list = (hwc_layer_list_1_t *) calloc(1, size)) == NULL) {
testPrintE("Allocate list failed");
exit(11);
}
@ -383,7 +383,7 @@ main(int argc, char *argv[])
// Perform prepare operation
if (verbose) { testPrintI("Prepare:"); hwcTestDisplayList(list); }
hwcDevice->prepare(hwcDevice, 1, &list);
hwcDevice->prepare(hwcDevice, list);
if (verbose) {
testPrintI("Post Prepare:");
hwcTestDisplayListPrepareModifiable(list);
@ -393,9 +393,7 @@ main(int argc, char *argv[])
list->flags &= ~HWC_GEOMETRY_CHANGED;
if (verbose) {hwcTestDisplayListHandles(list); }
list->dpy = dpy;
list->sur = surface;
hwcDevice->set(hwcDevice, 1, &list);
hwcDevice->set(hwcDevice, dpy, surface, list);
testDelay(endDelay);

4
opengl/tests/hwc/hwcCommit.cpp
View File

@ -1397,7 +1397,7 @@ void Rational::double2Rational(double f, Range nRange, Range dRange,
// Given a list of rectangles, determine how many HWC will commit to render
uint32_t numOverlays(list<Rectangle>& rectList)
{
hwc_display_contents_1_t *hwcList;
hwc_layer_list_1_t *hwcList;
list<sp<GraphicBuffer> > buffers;
hwcList = hwcTestCreateLayerList(rectList.size());
@ -1430,7 +1430,7 @@ uint32_t numOverlays(list<Rectangle>& rectList)
// Perform prepare operation
if (verbose) { testPrintI("Prepare:"); hwcTestDisplayList(hwcList); }
hwcDevice->prepare(hwcDevice, 1, &hwcList);
hwcDevice->prepare(hwcDevice, hwcList);
if (verbose) {
testPrintI("Post Prepare:");
hwcTestDisplayListPrepareModifiable(hwcList);

8
opengl/tests/hwc/hwcRects.cpp
View File

@ -307,7 +307,7 @@ main(int argc, char *argv[])
}
// Create list of frames
hwc_display_contents_1_t *list;
hwc_layer_list_1_t *list;
list = hwcTestCreateLayerList(rectangle.size());
if (list == NULL) {
testPrintE("hwcTestCreateLayerList failed");
@ -329,7 +329,7 @@ main(int argc, char *argv[])
// Perform prepare operation
if (verbose) { testPrintI("Prepare:"); hwcTestDisplayList(list); }
hwcDevice->prepare(hwcDevice, 1, &list);
hwcDevice->prepare(hwcDevice, list);
if (verbose) {
testPrintI("Post Prepare:");
hwcTestDisplayListPrepareModifiable(list);
@ -341,9 +341,7 @@ main(int argc, char *argv[])
// Perform the set operation(s)
if (verbose) {testPrintI("Set:"); }
if (verbose) { hwcTestDisplayListHandles(list); }
list->dpy = dpy;
list->sur = surface;
hwcDevice->set(hwcDevice, 1, &list);
hwcDevice->set(hwcDevice, dpy, surface, list);
testDelay(endDelay);

8
opengl/tests/hwc/hwcStress.cpp
View File

@ -409,7 +409,7 @@ main(int argc, char *argv[])
// generated for this pass.
srand48(pass);
hwc_display_contents_1_t *list;
hwc_layer_list_1_t *list;
list = hwcTestCreateLayerList(testRandMod(frames.size()) + 1);
if (list == NULL) {
testPrintE("hwcTestCreateLayerList failed");
@ -478,7 +478,7 @@ main(int argc, char *argv[])
// Perform prepare operation
if (verbose) { testPrintI("Prepare:"); hwcTestDisplayList(list); }
hwcDevice->prepare(hwcDevice, 1, &list);
hwcDevice->prepare(hwcDevice, list);
if (verbose) {
testPrintI("Post Prepare:");
hwcTestDisplayListPrepareModifiable(list);
@ -491,9 +491,7 @@ main(int argc, char *argv[])
if (verbose) {testPrintI("Set:"); }
for (unsigned int n1 = 0; n1 < numSet; n1++) {
if (verbose) { hwcTestDisplayListHandles(list); }
list->dpy = dpy;
list->sur = surface;
hwcDevice->set(hwcDevice, 1, &list);
hwcDevice->set(hwcDevice, dpy, surface, list);
// Prandomly select a new set of handles
for (unsigned int n1 = 0; n1 < list->numHwLayers; n1++) {

16
opengl/tests/hwc/hwcTestLib.cpp
View File

@ -399,12 +399,12 @@ const char *hwcTestGraphicFormat2str(uint32_t format)
* Dynamically creates layer list with numLayers worth
* of hwLayers entries.
*/
hwc_display_contents_1_t *hwcTestCreateLayerList(size_t numLayers)
hwc_layer_list_1_t *hwcTestCreateLayerList(size_t numLayers)
{
hwc_display_contents_1_t *list;
hwc_layer_list_1_t *list;
size_t size = sizeof(hwc_display_contents_1_t) + numLayers * sizeof(hwc_layer_1_t);
if ((list = (hwc_display_contents_1_t *) calloc(1, size)) == NULL) {
size_t size = sizeof(hwc_layer_list_1_t) + numLayers * sizeof(hwc_layer_1_t);
if ((list = (hwc_layer_list_1_t *) calloc(1, size)) == NULL) {
return NULL;
}
list->flags = HWC_GEOMETRY_CHANGED;
@ -417,13 +417,13 @@ hwc_display_contents_1_t *hwcTestCreateLayerList(size_t numLayers)
* hwcTestFreeLayerList
* Frees memory previous allocated via hwcTestCreateLayerList().
*/
void hwcTestFreeLayerList(hwc_display_contents_1_t *list)
void hwcTestFreeLayerList(hwc_layer_list_1_t *list)
{
free(list);
}
// Display the settings of the layer list pointed to by list
void hwcTestDisplayList(hwc_display_contents_1_t *list)
void hwcTestDisplayList(hwc_layer_list_1_t *list)
{
testPrintI(" flags: %#x%s", list->flags,
(list->flags & HWC_GEOMETRY_CHANGED) ? " GEOMETRY_CHANGED" : "");
@ -494,7 +494,7 @@ void hwcTestDisplayList(hwc_display_contents_1_t *list)
* Displays the portions of a list that are meant to be modified by
* a prepare call.
*/
void hwcTestDisplayListPrepareModifiable(hwc_display_contents_1_t *list)
void hwcTestDisplayListPrepareModifiable(hwc_layer_list_1_t *list)
{
uint32_t numOverlays = 0;
for (unsigned int layer = 0; layer < list->numHwLayers; layer++) {
@ -522,7 +522,7 @@ void hwcTestDisplayListPrepareModifiable(hwc_display_contents_1_t *list)
*
* Displays the handles of all the graphic buffers in the list.
*/
void hwcTestDisplayListHandles(hwc_display_contents_1_t *list)
void hwcTestDisplayListHandles(hwc_layer_list_1_t *list)
{
const unsigned int maxLayersPerLine = 6;

10
opengl/tests/hwc/hwcTestLib.h
View File

@ -113,11 +113,11 @@ const struct hwcTestGraphicFormat *hwcTestGraphicFormatLookup(uint32_t id);
const char *hwcTestGraphicFormat2str(uint32_t format);
std::string hwcTestRect2str(const struct hwc_rect& rect);
hwc_display_contents_1_t *hwcTestCreateLayerList(size_t numLayers);
void hwcTestFreeLayerList(hwc_display_contents_1_t *list);
void hwcTestDisplayList(hwc_display_contents_1_t *list);
void hwcTestDisplayListPrepareModifiable(hwc_display_contents_1_t *list);
void hwcTestDisplayListHandles(hwc_display_contents_1_t *list);
hwc_layer_list_1_t *hwcTestCreateLayerList(size_t numLayers);
void hwcTestFreeLayerList(hwc_layer_list_1_t *list);
void hwcTestDisplayList(hwc_layer_list_1_t *list);
void hwcTestDisplayListPrepareModifiable(hwc_layer_list_1_t *list);
void hwcTestDisplayListHandles(hwc_layer_list_1_t *list);
uint32_t hwcTestColor2Pixel(uint32_t format, ColorFract color, float alpha);
void hwcTestColorConvert(uint32_t fromFormat, uint32_t toFormat,

62
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -57,12 +57,12 @@ namespace android {
// can just use the v1.0 pointer without branches or casts.
#if HWC_REMOVE_DEPRECATED_VERSIONS
// We need complete types to satisfy semantic checks, even though the code
// paths that use these won't get executed at runtime (and will likely be dead-
// code-eliminated). When we remove the code to support v0.3 we can remove
// We need complete types with to satisfy semantic checks, even though the
// code paths that use these won't get executed at runtime (and will likely be
// dead-code-eliminated). When we remove the code to support v0.3 we can remove
// these as well.
typedef hwc_layer_1_t hwc_layer_t;
typedef hwc_display_contents_1_t hwc_layer_list_t;
typedef hwc_layer_list_1_t hwc_layer_list_t;
typedef hwc_composer_device_1_t hwc_composer_device_t;
#endif
@ -80,7 +80,7 @@ static bool hwcHasVersion(const hwc_composer_device_1_t* hwc, uint32_t version)
static size_t sizeofHwcLayerList(const hwc_composer_device_1_t* hwc,
size_t numLayers) {
if (hwcHasVersion(hwc, HWC_DEVICE_API_VERSION_1_0)) {
return sizeof(hwc_display_contents_1_t) + numLayers*sizeof(hwc_layer_1_t);
return sizeof(hwc_layer_list_1_t) + numLayers*sizeof(hwc_layer_1_t);
} else {
return sizeof(hwc_layer_list_t) + numLayers*sizeof(hwc_layer_t);
}
@ -136,17 +136,11 @@ HWComposer::HWComposer(
}
if (mHwc) {
// always turn vsync off when we start
needVSyncThread = false;
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
mHwc->methods->eventControl(mHwc, 0, HWC_EVENT_VSYNC, 0);
} else if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_0_3)) {
hwc_composer_device_t* hwc0 = (hwc_composer_device_t*)mHwc;
err = hwc0->methods->eventControl(hwc0, HWC_EVENT_VSYNC, 0);
} else {
needVSyncThread = true;
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_0_3)) {
// always turn vsync off when we start
mHwc->methods->eventControl(mHwc, HWC_EVENT_VSYNC, 0);
needVSyncThread = false;
}
if (mHwc->registerProcs) {
mCBContext->hwc = this;
mCBContext->procs.invalidate = &hook_invalidate;
@ -200,12 +194,7 @@ void HWComposer::eventControl(int event, int enabled) {
status_t err = NO_ERROR;
if (mHwc && mHwc->common.version >= HWC_DEVICE_API_VERSION_0_3) {
if (!mDebugForceFakeVSync) {
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
err = mHwc->methods->eventControl(mHwc, 0, event, enabled);
} else {
hwc_composer_device_t* hwc0 = (hwc_composer_device_t*)mHwc;
err = hwc0->methods->eventControl(hwc0, event, enabled);
}
err = mHwc->methods->eventControl(mHwc, event, enabled);
// error here should not happen -- not sure what we should
// do if it does.
ALOGE_IF(err, "eventControl(%d, %d) failed %s",
@ -228,9 +217,8 @@ status_t HWComposer::createWorkList(size_t numLayers) {
if (!mList || mCapacity < numLayers) {
free(mList);
size_t size = sizeofHwcLayerList(mHwc, numLayers);
mList = (hwc_display_contents_1_t*)malloc(size);
mList = (hwc_layer_list_1_t*)malloc(size);
mCapacity = numLayers;
mList->flipFenceFd = -1;
}
mList->flags = HWC_GEOMETRY_CHANGED;
mList->numHwLayers = numLayers;
@ -239,8 +227,7 @@ status_t HWComposer::createWorkList(size_t numLayers) {
}
status_t HWComposer::prepare() const {
int err = mHwc->prepare(mHwc, 1,
const_cast<hwc_display_contents_1_t**>(&mList));
int err = mHwc->prepare(mHwc, mList);
if (err == NO_ERROR) {
size_t numOVLayers = 0;
size_t numFBLayers = 0;
@ -286,17 +273,9 @@ size_t HWComposer::getLayerCount(int type) const {
status_t HWComposer::commit() const {
int err = NO_ERROR;
if (mHwc) {
if (mList) {
mList->dpy = mDpy;
mList->sur = mSur;
}
err = mHwc->set(mHwc, 1, const_cast<hwc_display_contents_1_t**>(&mList));
err = mHwc->set(mHwc, mDpy, mSur, mList);
if (mList) {
mList->flags &= ~HWC_GEOMETRY_CHANGED;
if (mList->flipFenceFd != -1) {
close(mList->flipFenceFd);
mList->flipFenceFd = -1;
}
}
} else {
eglSwapBuffers(mDpy, mSur);
@ -306,20 +285,17 @@ status_t HWComposer::commit() const {
status_t HWComposer::release() const {
if (mHwc) {
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
mHwc->methods->eventControl(mHwc, 0, HWC_EVENT_VSYNC, 0);
} else if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_0_3)) {
hwc_composer_device_t* hwc0 = (hwc_composer_device_t*)mHwc;
hwc0->methods->eventControl(hwc0, HWC_EVENT_VSYNC, 0);
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_0_3)) {
mHwc->methods->eventControl(mHwc, HWC_EVENT_VSYNC, 0);
}
int err = mHwc->set(mHwc, 0, NULL);
int err = mHwc->set(mHwc, NULL, NULL, NULL);
if (err < 0) {
return (status_t)err;
}
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
if (mHwc->methods && mHwc->methods->blank) {
err = mHwc->methods->blank(mHwc, 0, 1);
err = mHwc->methods->blank(mHwc, 1);
}
}
return (status_t)err;
@ -331,7 +307,7 @@ status_t HWComposer::acquire() const {
if (mHwc) {
if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
if (mHwc->methods && mHwc->methods->blank) {
int err = mHwc->methods->blank(mHwc, 0, 0);
int err = mHwc->methods->blank(mHwc, 0);
return (status_t)err;
}
}
@ -344,7 +320,7 @@ status_t HWComposer::disable() {
if (mHwc) {
free(mList);
mList = NULL;
int err = mHwc->prepare(mHwc, 0, NULL);
int err = mHwc->prepare(mHwc, NULL);
return (status_t)err;
}
return NO_ERROR;

4
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

@ -36,7 +36,7 @@ extern "C" int clock_nanosleep(clockid_t clock_id, int flags,
struct timespec *remain);
struct hwc_composer_device_1;
struct hwc_display_contents_1;
struct hwc_layer_list_1;
struct hwc_procs;
namespace android {
@ -230,7 +230,7 @@ private:
sp<SurfaceFlinger> mFlinger;
hw_module_t const* mModule;
struct hwc_composer_device_1* mHwc;
struct hwc_display_contents_1* mList;
struct hwc_layer_list_1* mList;
size_t mCapacity;
mutable size_t mNumOVLayers;
mutable size_t mNumFBLayers;