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

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 12a94d9df06712ce7d8e88aface028c8a699d068..965e34ddd1b79f8c6b996a572e0edb9a80622586 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -58,6 +58,7 @@ public:
        unsigned get_height() const { return height; }
        Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
+       virtual bool is_single_texture() const { return true; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change
        // this data, you must either call set_pixel_data() again (using the same pointer
@@ -77,7 +78,15 @@ public:
                invalidate_pixel_data();
        }
 
-       void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+       void set_pixel_data(const unsigned short *pixel_data, GLuint pbo = 0)
+       {
+               assert(this->type == GL_UNSIGNED_SHORT);
+               this->pixel_data = pixel_data;
+               this->pbo = pbo;
+               invalidate_pixel_data();
+       }
+
+       void set_pixel_data_fp16(const fp16_int_t *pixel_data, GLuint pbo = 0)
        {
                assert(this->type == GL_HALF_FLOAT);
                this->pixel_data = pixel_data;