Use the right internal format for FORMAT_R non-float textures.

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 46370d6c2381c96defbf5e1b8b85b35d9c01f7fd..5978ca3b51c4116441933537a6168707f210d44a 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <assert.h>
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 #include "effect_util.h"
 #include "flat_input.h"
@@ -74,7 +74,13 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
                        internal_format = GL_SRGB8_ALPHA8;
                } else {
                        assert(type == GL_UNSIGNED_BYTE);
-                       internal_format = GL_RGBA8;
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R8;
+                       } else if (pixel_format == FORMAT_RG) {
+                               internal_format = GL_RG8;
+                       } else {
+                               internal_format = GL_RGBA8;
+                       }
                }
                if (pixel_format == FORMAT_RGB) {
                        format = GL_RGB;