commit f3357ee2ba1e80d8f6acb8ff2d0da7ff14f3b64c
author Corentin Wallez <cwallez@chromium.org> Wed Jul 22 14:10:19 2015 -0400
committer Corentin Wallez <cwallez@chromium.org> Thu Jul 23 15:25:26 2015 +0000
tree 0bbb9227f29179548ea0c3f994f4a7b05d51030d
parent 0932df6158964904108b45498befdc8f39b4029a

EGLWindow: remove the unused width and height

EGLWindow does nothing with it per se, but some code was relying on it
to store it. Add width and height to ANGLETest and SampleApplication
instead. Also fix a typo in PerfTestParams, widowWidth -> windowWidth.

BUG=angleproject:1105

Change-Id: I26da607a2e6342864b508a50ee3cf8944608f868
Reviewed-on: https://chromium-review.googlesource.com/287379
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

src/tests/gl_tests/PbufferTest.cpp

diff --git a/src/tests/gl_tests/PbufferTest.cpp b/src/tests/gl_tests/PbufferTest.cpp
index 7bfde32..35d91c9 100644
--- a/src/tests/gl_tests/PbufferTest.cpp
+++ b/src/tests/gl_tests/PbufferTest.cpp
@@ -130,7 +130,7 @@
     glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
     ASSERT_GL_NO_ERROR();
-    EXPECT_PIXEL_EQ(window->getWidth() / 2, window->getHeight() / 2, 0, 0, 255, 255);
+    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 255, 255);
 
     // Apply the Pbuffer and clear it to purple and verify
     eglMakeCurrent(window->getDisplay(), mPbuffer, mPbuffer, window->getContext());
@@ -145,7 +145,7 @@
     // Rebind the window surface and verify that it is still blue
     eglMakeCurrent(window->getDisplay(), window->getSurface(), window->getSurface(), window->getContext());
     ASSERT_EGL_SUCCESS();
-    EXPECT_PIXEL_EQ(window->getWidth() / 2, window->getHeight() / 2, 0, 0, 255, 255);
+    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 255, 255);
 }
 
 // Bind the Pbuffer to a texture and verify it renders correctly
@@ -190,7 +190,7 @@
     EXPECT_GL_NO_ERROR();
 
     eglBindTexImage(window->getDisplay(), mPbuffer, EGL_BACK_BUFFER);
-    glViewport(0, 0, window->getWidth(), window->getHeight());
+    glViewport(0, 0, getWindowWidth(), getWindowHeight());
     ASSERT_EGL_SUCCESS();
 
     // Draw a quad and verify that it is purple
@@ -205,7 +205,7 @@
     ASSERT_EGL_SUCCESS();
 
     // Verify that purple was drawn
-    EXPECT_PIXEL_EQ(window->getWidth() / 2, window->getHeight() / 2, 255, 0, 255, 255);
+    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 255, 0, 255, 255);
 
     glDeleteTextures(1, &texture);
 }
@@ -308,13 +308,13 @@
     EXPECT_GL_NO_ERROR();
 
     eglBindTexImage(window->getDisplay(), mPbuffer, EGL_BACK_BUFFER);
-    glViewport(0, 0, window->getWidth(), window->getHeight());
+    glViewport(0, 0, getWindowWidth(), getWindowHeight());
     ASSERT_EGL_SUCCESS();
 
     // Redefine the texture
     unsigned int pixelValue = 0xFFFF00FF;
-    std::vector<unsigned int> pixelData(window->getWidth() * window->getHeight(), pixelValue);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, window->getWidth(), window->getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixelData[0]);
+    std::vector<unsigned int> pixelData(getWindowWidth() * getWindowHeight(), pixelValue);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixelData[0]);
 
     // Draw a quad and verify that it is magenta
     glUseProgram(mTextureProgram);
@@ -324,7 +324,7 @@
     EXPECT_GL_NO_ERROR();
 
     // Verify that magenta was drawn
-    EXPECT_PIXEL_EQ(window->getWidth() / 2, window->getHeight() / 2, 255, 0, 255, 255);
+    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 255, 0, 255, 255);
 
     glDeleteTextures(1, &texture);
 }