commit 3318d1809dfce03eb876d6a2eba39018a0e7d7be
author Mathias Agopian <mathias@google.com> Tue Jul 16 22:56:00 2013 -0700
committer Mathias Agopian <mathias@google.com> Tue Jul 16 22:56:00 2013 -0700
tree a6bc17b54911dd703e3d16ba207e3f00292cf269
parent 797e2b7661259e1775c8690af049101dc7059272

revert to using a pbuffer as the dummy egl surface

Change-Id: I2c30a6a33d3412ffee899494847fdc882b96e173

driver/rsdGL.cpp

diff --git a/driver/rsdGL.cpp b/driver/rsdGL.cpp
index 0a23a44..c421ade 100644
--- a/driver/rsdGL.cpp
+++ b/driver/rsdGL.cpp
@@ -43,7 +43,6 @@
 #include "rsdFrameBufferObj.h"
 
 #include <gui/Surface.h>
-#include <gui/DummyConsumer.h>
 
 using namespace android;
 using namespace android::renderscript;
@@ -326,18 +325,13 @@
     }
     gGLContextCount++;
 
-    // Create a BufferQueue with a fake consumer
-    sp<BufferQueue> bq = new BufferQueue();
-    bq->consumerConnect(new DummyConsumer());
-    sp<Surface> stc(new Surface(static_cast<sp<IGraphicBufferProducer> >(bq)));
-
-    dc->gl.egl.surfaceDefault = eglCreateWindowSurface(dc->gl.egl.display, dc->gl.egl.config,
-                                                       static_cast<ANativeWindow*>(stc.get()),
-                                                       NULL);
-
-    checkEglError("eglCreateWindowSurface");
+    EGLint pbuffer_attribs[] = { EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE };
+    rsc->setWatchdogGL("eglCreatePbufferSurface", __LINE__, __FILE__);
+    dc->gl.egl.surfaceDefault = eglCreatePbufferSurface(dc->gl.egl.display, dc->gl.egl.config,
+            pbuffer_attribs);
+    checkEglError("eglCreatePbufferSurface");
     if (dc->gl.egl.surfaceDefault == EGL_NO_SURFACE) {
-        ALOGE("eglCreateWindowSurface returned EGL_NO_SURFACE");
+        ALOGE("eglCreatePbufferSurface returned EGL_NO_SURFACE");
         rsdGLShutdown(rsc);
         rsc->setWatchdogGL(NULL, 0, NULL);
         return false;