Give the alpha enums somewhat better/more consistent names, and shuffle them around...

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index cf6b0b9264d878b0e90378c00d61cb5369fec741..24a3fcad90347c545c093884dba809488ea6a317 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,7 +1,10 @@
 #ifndef _FLAT_INPUT_H
 #define _FLAT_INPUT_H 1
 
+#include <assert.h>
+
 #include "input.h"
+#include "init.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
@@ -17,12 +20,28 @@ public:
        // mipmap generation) at that point.
        void finalize();
 
-       // TODO: Check that we actually have the required extension.
        virtual bool can_output_linear_gamma() const {
-               return (type == GL_UNSIGNED_BYTE &&
+               return (movit_srgb_textures_supported &&
+                       type == GL_UNSIGNED_BYTE &&
                        (image_format.gamma_curve == GAMMA_LINEAR ||
                         image_format.gamma_curve == GAMMA_sRGB));
        }
+       virtual AlphaHandling alpha_handling() const {
+               switch (pixel_format) {
+               case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+                       return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
+               case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+                       return OUTPUT_POSTMULTIPLIED_ALPHA;
+               case FORMAT_RGB:
+               case FORMAT_BGR:
+               case FORMAT_GRAYSCALE:
+                       return OUTPUT_BLANK_ALPHA;
+               default:
+                       assert(false);
+               }
+       }
 
        std::string output_fragment_shader();