gpu/khronos_glcts_support: override Surface getWidth/Height

The GL-CTS default Surface getWidth/Height implementation calls
eglQuerySurface() to retrieve the surface's size and uses this
information to create it's tcuRenderTarget object.  However, we
don't implement the eglQuerySurface() and thus the tcuRenderTarget
gets the wrong surface size.  This resulted in several test
failures.

Add our own derived Surface class and override the getWidth/Height
methods to return the correct size.

BUG=chromium:412865
R=kbr@chromium.org, piman@chromium.org
TEST=Build and run the khronos_glcts_test binary

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

Review URL: https://codereview.chromium.org/634323002

Cr-Commit-Position: refs/heads/master@{#298766}

1 files changed, 26 insertions, 3 deletions

diff --git a/gpu/khronos_glcts_support/native/egl_native_windowless.cc b/gpu/khronos_glcts_support/native/egl_native_windowless.cc
index ac0e908..1a575a5 100644
--- a/gpu/khronos_glcts_support/native/egl_native_windowless.cc
+++ b/gpu/khronos_glcts_support/native/egl_native_windowless.cc
@@ -14,6 +14,29 @@ namespace egl {
 namespace native {
 namespace windowless {
 
+class Surface : public tcu::egl::WindowSurface {
+ public:
+  Surface(tcu::egl::Display& display,
+          EGLConfig config,
+          const EGLint* attribList,
+          int width,
+          int height)
+      : tcu::egl::WindowSurface(display,
+                                config,
+                                (EGLNativeWindowType)NULL,
+                                attribList),
+        width_(width),
+        height_(height) {}
+
+  int getWidth() const { return width_; }
+
+  int getHeight() const { return height_; }
+
+ private:
+  const int width_;
+  const int height_;
+};
+
 class Window : public tcu::NativeWindow {
  public:
   Window(tcu::egl::Display& display,
@@ -23,19 +46,19 @@ class Window : public tcu::NativeWindow {
          int height)
       : tcu::NativeWindow::NativeWindow(),
         eglDisplay_(display),
-        eglSurface_(display, config, (EGLNativeWindowType)NULL, attribList) {}
+        surface_(display, config, attribList, width, height) {}
 
   virtual ~Window() {}
 
   tcu::egl::Display& getEglDisplay() { return eglDisplay_; }
 
-  tcu::egl::WindowSurface& getEglSurface() { return eglSurface_; }
+  tcu::egl::WindowSurface& getEglSurface() { return surface_; }
 
   void processEvents() { return; }
 
  private:
   tcu::egl::Display& eglDisplay_;
-  tcu::egl::WindowSurface eglSurface_;
+  Surface surface_;
 };
 
 class Platform : public tcu::EglPlatform {