Fix MultipleDrawBuffers sample when GL_OES_texture_npot isn't active

If the GL_OES_texture_npot extension isn't active, then setting GL_TEXTURE_WRAP_S/T to GL_REPEAT for a NPOT texture results in black rendering. This is specified in Section 3.8.2 of the OpenGL ES 2.0 specification. Setting GL_TEXTURE_WRAP_S/T to GL_CLAMP_TO_EDGE is valid even if the NPOT extension isn't active. Change-Id: Ibd553620995df32138bf8153d1036fd05d386d90 Reviewed-on: https://chromium-review.googlesource.com/306302Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fix MultipleDrawBuffers sample when GL_OES_texture_npot isn't active
adb857b2 · Austin Kinross · Geoff Lang · d2c52e3b · adb857b2
Commit adb857b2 authored Oct 15, 2015 by Austin Kinross Committed by Geoff Lang Oct 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MultipleDrawBuffers.cpp samples/multiple_draw_buffers/MultipleDrawBuffers.cpp +2 -2

No files found.
--- a/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
+++ b/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
@@ -83,8 +83,8 @@ class MultipleDrawBuffersSample : public SampleApplication
            // Create textures for the four color attachments
            glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[i]);
            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindow()->getWidth(), getWindow()->getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
            glFramebufferTexture2D(GL_FRAMEBUFFER,