Fix null sampler warning in TextureTest.TextureNPOT_GL_ALPHA_UBYTE

src/libANGLE/renderer/d3d/RendererD3D.cpp

@@ -427,7 +427,15 @@ gl::Error RendererD3D::applyTextures(const gl::Data &data, gl::SamplerType shade
             {
                 // Texture is not sampler complete or it is in use by the framebuffer.  Bind the incomplete texture.
                 gl::Texture *incompleteTexture = getIncompleteTexture(textureType);
-                gl::Error error = setTexture(shaderType, samplerIndex, incompleteTexture);
+
+                gl::Error error = setSamplerState(shaderType, samplerIndex, incompleteTexture,
+                                                  incompleteTexture->getSamplerState());
+                if (error.isError())
+                {
+                    return error;
+                }
+
+                error = setTexture(shaderType, samplerIndex, incompleteTexture);
                 if (error.isError())
                 {
                     return error;

src/tests/gl_tests/TextureTest.cpp

@@ -885,6 +885,9 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
 
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
+    // Default unpack alignment is 4. The values of 'pixels' below needs it to be 1.
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
     glActiveTexture(GL_TEXTURE0);
     glGenTextures(1, &tex2D);
     glBindTexture(GL_TEXTURE_2D, tex2D);