commit 7ef72a18750616a4cab0959b08ab7fe61cb0dd71
author Mika Isojarvi <misojarvi@google.com> Fri Mar 18 22:59:19 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 22:59:19 2016 +0000
tree f04a3f76a07f8ea2d2c90b95411a0cbab72a85bf
parent 63802fadbfdabc9abf4e34ac7766890be81d77af
parent b15ba11e484691c847c7de59af5b86a57b7e4e5d

Merge "Fix typo in negative buffer API tests" into nyc-dev

modules/gles31/functional/es31fNegativeBufferApiTests.cpp

diff --git a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
index 509d48c..aba9705 100644
--- a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
@@ -1253,7 +1253,7 @@
 	ctx.expectError(GL_INVALID_VALUE);
 	ctx.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, texCube, -1);
 	ctx.expectError(GL_INVALID_VALUE);
-	ctx.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, tex2D, 1);
+	ctx.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, tex2DMS, 1);
 	ctx.expectError(GL_INVALID_VALUE);
 	ctx.endSection();