Commit 630d558f by Corentin Wallez Committed by Commit Bot

TextureRectangleTest: Fix RAII ignore lifetime

BUG=angleproject:2122 Change-Id: Ia51c139197e1b90e54505278d301ae8ac7dab53d Reviewed-on: https://chromium-review.googlesource.com/653240 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent cecab592
...@@ -70,7 +70,7 @@ TEST_P(TextureRectangleTest, TexImage2D) ...@@ -70,7 +70,7 @@ TEST_P(TextureRectangleTest, TexImage2D)
// Defining a texture of the max size is allowed // Defining a texture of the max size is allowed
{ {
ignorePlatformMessagesInScope(); ScopedIgnorePlatformMessages(this);
glTexImage2D(GL_TEXTURE_RECTANGLE_ANGLE, 0, GL_RGBA, maxSize, maxSize, 0, GL_RGBA, glTexImage2D(GL_TEXTURE_RECTANGLE_ANGLE, 0, GL_RGBA, maxSize, maxSize, 0, GL_RGBA,
GL_UNSIGNED_BYTE, nullptr); GL_UNSIGNED_BYTE, nullptr);
...@@ -156,7 +156,7 @@ TEST_P(TextureRectangleTest, TexStorage2D) ...@@ -156,7 +156,7 @@ TEST_P(TextureRectangleTest, TexStorage2D)
// Defining a texture of the max size is allowed but still allow for OOM // Defining a texture of the max size is allowed but still allow for OOM
{ {
ignorePlatformMessagesInScope(); ScopedIgnorePlatformMessages(this);
GLTexture tex; GLTexture tex;
glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, tex); glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, tex);
......
...@@ -1088,11 +1088,6 @@ void ANGLETestBase::ignoreD3D11SDKLayersWarnings() ...@@ -1088,11 +1088,6 @@ void ANGLETestBase::ignoreD3D11SDKLayersWarnings()
mIgnoreD3D11SDKLayersWarnings = true; mIgnoreD3D11SDKLayersWarnings = true;
} }
ANGLETestBase::ScopedIgnorePlatformMessages ANGLETestBase::ignorePlatformMessagesInScope()
{
return {this};
}
ANGLETestBase::ScopedIgnorePlatformMessages::ScopedIgnorePlatformMessages(ANGLETestBase *test) ANGLETestBase::ScopedIgnorePlatformMessages::ScopedIgnorePlatformMessages(ANGLETestBase *test)
: mTest(test) : mTest(test)
{ {
......
...@@ -329,7 +329,6 @@ class ANGLETestBase ...@@ -329,7 +329,6 @@ class ANGLETestBase
angle::PlatformMethods mPlatformMethods; angle::PlatformMethods mPlatformMethods;
private:
class ScopedIgnorePlatformMessages : angle::NonCopyable class ScopedIgnorePlatformMessages : angle::NonCopyable
{ {
public: public:
...@@ -340,9 +339,6 @@ class ANGLETestBase ...@@ -340,9 +339,6 @@ class ANGLETestBase
ANGLETestBase *mTest; ANGLETestBase *mTest;
}; };
protected:
ScopedIgnorePlatformMessages ignorePlatformMessagesInScope();
private: private:
bool destroyEGLContext(); bool destroyEGLContext();
......
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