commit bc0d7dc8f5f43749ff6e7f0b42c760f5ee9f6d14
author Jesse Hall <jessehall@google.com> Tue Jul 31 12:16:31 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 31 12:16:31 2012 -0700
tree 235abd54f4c3c6ed2c6b59bbade55a6459f13ed8
parent bddd724b178b1263c16e41b564165fcd0e93ff83

Revert "Minimal changes to support multi-display HWC"

This reverts commit bddd724b178b1263c16e41b564165fcd0e93ff83

Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4

opengl/tests/hwc/hwcRects.cpp

diff --git a/opengl/tests/hwc/hwcRects.cpp b/opengl/tests/hwc/hwcRects.cpp
index ec0403f..e2f0039 100644
--- a/opengl/tests/hwc/hwcRects.cpp
+++ b/opengl/tests/hwc/hwcRects.cpp
@@ -307,7 +307,7 @@
     }
 
     // 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 @@
 
     // 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 @@
     // 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);