Make available EGL surface parameters queryable.

src/GLES2/libEGL/Surface.cpp

@@ -196,16 +196,6 @@ void Surface::swap()
 	}
 }
 
-EGLint Surface::getWidth() const
-{
-    return mWidth;
-}
-
-EGLint Surface::getHeight() const
-{
-    return mHeight;
-}
-
 gl::Image *Surface::getRenderTarget()
 {
     if(backBuffer)
@@ -238,6 +228,36 @@ void Surface::setSwapInterval(EGLint interval)
     mSwapInterval = std::min(mSwapInterval, mDisplay->getMaxSwapInterval());
 }
 
+EGLint Surface::getConfigID() const
+{
+    return mConfig->mConfigID;
+}
+
+EGLint Surface::getWidth() const
+{
+    return mWidth;
+}
+
+EGLint Surface::getHeight() const
+{
+    return mHeight;
+}
+
+EGLint Surface::getPixelAspectRatio() const
+{
+    return mPixelAspectRatio;
+}
+
+EGLenum Surface::getRenderBuffer() const
+{
+    return mRenderBuffer;
+}
+
+EGLenum Surface::getSwapBehavior() const
+{
+    return mSwapBehavior;
+}
+
 EGLenum Surface::getTextureFormat() const
 {
     return mTextureFormat;

src/GLES2/libEGL/Surface.h

@@ -46,14 +46,18 @@ public:
     void swap();
 
 	EGLNativeWindowType getWindowHandle();
-    virtual EGLint getWidth() const;
-    virtual EGLint getHeight() const;
-
+    
     virtual gl::Image *getRenderTarget();
     virtual gl::Image *getDepthStencil();
 
     void setSwapInterval(EGLint interval);
 
+    virtual EGLint getConfigID() const;
+    virtual EGLint getWidth() const;
+    virtual EGLint getHeight() const;
+    virtual EGLint getPixelAspectRatio() const;
+    virtual EGLenum getRenderBuffer() const;
+    virtual EGLenum getSwapBehavior() const;
     virtual EGLenum getTextureFormat() const;
     virtual EGLenum getTextureTarget() const;
     virtual sw::Format getInternalFormat() const;

src/GLES2/libEGL/libEGL.cpp

@@ -448,7 +448,7 @@ EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLin
             UNIMPLEMENTED();   // FIXME
             break;
           case EGL_CONFIG_ID:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getConfigID();
             break;
           case EGL_HEIGHT:
             *value = eglSurface->getHeight();
@@ -469,19 +469,19 @@ EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLin
             UNIMPLEMENTED();   // FIXME
             break;
           case EGL_PIXEL_ASPECT_RATIO:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getPixelAspectRatio();
             break;
           case EGL_RENDER_BUFFER:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getRenderBuffer();
             break;
           case EGL_SWAP_BEHAVIOR:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getSwapBehavior();
             break;
           case EGL_TEXTURE_FORMAT:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getTextureFormat();
             break;
           case EGL_TEXTURE_TARGET:
-            UNIMPLEMENTED();   // FIXME
+            *value = eglSurface->getTextureTarget();
             break;
           case EGL_VERTICAL_RESOLUTION:
             UNIMPLEMENTED();   // FIXME
@@ -859,9 +859,6 @@ EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurfac
             UNIMPLEMENTED();   // FIXME
         }
 
-        egl::Surface* previousDraw = static_cast<egl::Surface*>(egl::getCurrentDrawSurface());
-        egl::Surface* previousRead = static_cast<egl::Surface*>(egl::getCurrentReadSurface());
-
         egl::setCurrentDisplay(dpy);
         egl::setCurrentDrawSurface(draw);
         egl::setCurrentReadSurface(read);