Search images in more framebuffer attachments.

diff --git a/driver.py b/driver.py
index 1c4904cc24b335f3672e846386ac4fd707ce89ce..871ef097ec63cc7a1f115d40f23800aa69f72760 100755 (executable)
--- a/driver.py
+++ b/driver.py
@@ -343,17 +343,28 @@ class TestCase:
 
     def getImage(self, callNo):
         state = self.getState(callNo)
 
     def getImage(self, callNo):
         state = self.getState(callNo)

-        framebuffer = state['framebuffer']

         if self.doubleBuffer:
         if self.doubleBuffer:

-            imageObj = framebuffer['GL_BACK']
+            attachments = ['GL_BACK', 'GL_BACK_LEFT', 'GL_BACK_RIGHT', 'GL_COLOR_ATTACHMENT0']

         else:
         else:

-            imageObj = framebuffer['GL_FRONT']
+            attachments = ['GL_FRONT', 'GL_FRONT_LEFT', 'GL_FRONT_RIGHT', 'GL_COLOR_ATTACHMENT0']
+        imageObj = self.getFramebufferAttachment(state, attachments)

         data = imageObj['__data__']
         stream = StringIO(base64.b64decode(data))
         im = Image.open(stream)
         im.save('test.png')
         return im
 
         data = imageObj['__data__']
         stream = StringIO(base64.b64decode(data))
         im = Image.open(stream)
         im.save('test.png')
         return im
 

+    def getFramebufferAttachment(self, state, attachments):
+        framebufferObj = state['framebuffer']
+        for attachment in attachments:
+            try:
+                attachmentObj = framebufferObj[attachment]
+            except KeyError:
+                pass
+            else:
+                return attachmentObj
+        raise Exception("no attachment found")
+

     def getState(self, callNo):
         try:
             state = self.stateCache[callNo]
     def getState(self, callNo):
         try:
             state = self.stateCache[callNo]