Redo FBO association yet again, this time per-texture.

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 70cc10984cc2b2397f4ee109853cdf5bc0ccfc08..a95b90e563f9d268378461dc196f67b282c4a670 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -9,13 +9,14 @@
 
 using namespace std;
 
+namespace movit {
+
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
        : image_format(image_format),
           pixel_format(pixel_format),
          type(type),
          pbo(0),
          texture_num(0),
-         finalized(false),
          output_linear_gamma(false),
          needs_mipmaps(false),
          width(width),
@@ -23,7 +24,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
          pitch(width),
          pixel_data(NULL)
 {
-       assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
+       assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_SHORT || type == GL_UNSIGNED_BYTE);
        register_int("output_linear_gamma", &output_linear_gamma);
        register_int("needs_mipmaps", &needs_mipmaps);
 }
@@ -35,43 +36,70 @@ FlatInput::~FlatInput()
        }
 }
 
-void FlatInput::finalize()
-{
-       // Translate the input format to OpenGL's enums.
-       if (type == GL_FLOAT) {
-               internal_format = GL_RGBA32F_ARB;
-       } else if (output_linear_gamma) {
-               assert(type == GL_UNSIGNED_BYTE);
-               internal_format = GL_SRGB8_ALPHA8;
-       } else {
-               assert(type == GL_UNSIGNED_BYTE);
-               internal_format = GL_RGBA8;
-       }
-       if (pixel_format == FORMAT_RGB) {
-               format = GL_RGB;
-       } else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA ||
-                  pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
-               format = GL_RGBA;
-       } else if (pixel_format == FORMAT_BGR) {
-               format = GL_BGR;
-       } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
-                  pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
-               format = GL_BGRA;
-       } else if (pixel_format == FORMAT_GRAYSCALE) {
-               format = GL_LUMINANCE;
-       } else {
-               assert(false);
-       }
-
-       finalized = true;
-}
-       
 void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();
 
        if (texture_num == 0) {
+               // Translate the input format to OpenGL's enums.
+               GLint internal_format;
+               GLenum format;
+               if (type == GL_FLOAT) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R32F;
+                       } else if (pixel_format == FORMAT_RG) {
+                               internal_format = GL_RG32F;
+                       } else {
+                               internal_format = GL_RGBA32F;
+                       }
+               } else if (type == GL_HALF_FLOAT) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R16F;
+                       } else if (pixel_format == FORMAT_RG) {
+                               internal_format = GL_RG16F;
+                       } else {
+                               internal_format = GL_RGBA16F;
+                       }
+               } else if (type == GL_UNSIGNED_SHORT) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R16;
+                       } else if (pixel_format == FORMAT_RG) {
+                               internal_format = GL_RG16;
+                       } else {
+                               internal_format = GL_RGBA16;
+                       }
+               } else if (output_linear_gamma) {
+                       assert(type == GL_UNSIGNED_BYTE);
+                       internal_format = GL_SRGB8_ALPHA8;
+               } else {
+                       assert(type == GL_UNSIGNED_BYTE);
+                       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;
+               } else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA ||
+                          pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
+                       format = GL_RGBA;
+               } else if (pixel_format == FORMAT_BGR) {
+                       format = GL_BGR;
+               } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
+                          pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
+                       format = GL_BGRA;
+               } else if (pixel_format == FORMAT_GRAYSCALE) {
+                       format = GL_LUMINANCE;
+               } else if (pixel_format == FORMAT_RG) {
+                       format = GL_RG;
+               } else {
+                       assert(false);
+               }
+
                // (Re-)upload the texture.
                texture_num = resource_pool->create_2d_texture(internal_format, width, height);
                glBindTexture(GL_TEXTURE_2D, texture_num);
@@ -122,3 +150,5 @@ void FlatInput::invalidate_pixel_data()
                texture_num = 0;
        }
 }
+
+}  // namespace movit