Commit 35ab4299 by Geoff Lang

Revert "Fix warnings on gcc builds in ImageTest.cpp."

This reverts commit 52ff4ac9. Change-Id: I11ec6e7e343dd6579f7aa13106facc65b05eb795 Reviewed-on: https://chromium-review.googlesource.com/290940Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 52ff4ac9
...@@ -391,18 +391,18 @@ TEST_P(ImageTest, ValidationImageBase) ...@@ -391,18 +391,18 @@ TEST_P(ImageTest, ValidationImageBase)
// If <dpy> is not the handle of a valid EGLDisplay object, the error EGL_BAD_DISPLAY is // If <dpy> is not the handle of a valid EGLDisplay object, the error EGL_BAD_DISPLAY is
// generated. // generated.
result = eglDestroyImageKHR(reinterpret_cast<EGLDisplay>(0xBAADF00D), image); result = eglDestroyImageKHR(reinterpret_cast<EGLDisplay>(0xBAADF00D), image);
EXPECT_EQ(result, static_cast<EGLBoolean>(EGL_FALSE)); EXPECT_EQ(result, EGL_FALSE);
EXPECT_EGL_ERROR(EGL_BAD_DISPLAY); EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);
// If <image> is not a valid EGLImageKHR object created with respect to <dpy>, the error // If <image> is not a valid EGLImageKHR object created with respect to <dpy>, the error
// EGL_BAD_PARAMETER is generated. // EGL_BAD_PARAMETER is generated.
result = eglDestroyImageKHR(display, reinterpret_cast<EGLImageKHR>(0xBAADF00D)); result = eglDestroyImageKHR(display, reinterpret_cast<EGLImageKHR>(0xBAADF00D));
EXPECT_EQ(result, static_cast<EGLBoolean>(EGL_FALSE)); EXPECT_EQ(result, EGL_FALSE);
EXPECT_EGL_ERROR(EGL_BAD_PARAMETER); EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
// Clean up and validate image is destroyed // Clean up and validate image is destroyed
result = eglDestroyImageKHR(display, image); result = eglDestroyImageKHR(display, image);
EXPECT_EQ(result, static_cast<EGLBoolean>(EGL_TRUE)); EXPECT_EQ(result, EGL_TRUE);
EXPECT_EGL_SUCCESS(); EXPECT_EGL_SUCCESS();
glDeleteTextures(1, &glTexture2D); glDeleteTextures(1, &glTexture2D);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment