Change to using GLEW everywhere.

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 31800a74a28c69dc7368d47e48c7ce77cfa1431a..291bb0dcc3a08ce5c9024cd29153883907a0f0eb 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <assert.h>
 #include <string.h>
 #include <assert.h>

+#include <GL/glew.h>

 
 #include "flat_input.h"
 #include "util.h"
 
 #include "flat_input.h"
 #include "util.h"

-#include "opengl.h"

 
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
        : image_format(image_format),
 
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
        : image_format(image_format),


@@ -85,6 +85,8 @@ void FlatInput::finalize()
        check_error();
        glBindTexture(GL_TEXTURE_2D, texture_num);
        check_error();
        check_error();
        glBindTexture(GL_TEXTURE_2D, texture_num);
        check_error();

+       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+       check_error();

        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
        check_error();
        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
        check_error();
        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);