Switch to memory barriers, now that Mesa 11.1 has them (ATI always had problems with...

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index f00c7a2acc2067b656af4598b1b9c2022e1af756..223968a3c3b4b7201161b244af4b8be0dbd95c66 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -15,14 +15,16 @@
 #include <utility>
 #include <vector>
 
+#include "defs.h"
+#include "input_state.h"
+#include "ref_counted_frame.h"
+
 namespace movit {
 class ResourcePool;
 struct ImageFormat;
 struct YCbCrFormat;
 }  // namespace movit
 
-#define MAX_CARDS 16
-
 class NonBouncingYCbCrInput : public movit::YCbCrInput {
 public:
        NonBouncingYCbCrInput(const movit::ImageFormat &image_format,
@@ -38,14 +40,18 @@ class Theme {
 public:
        Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
 
-       std::pair<movit::EffectChain *, std::function<void()>>
-       get_chain(unsigned num, float t, unsigned width, unsigned height);
+       struct Chain {
+               movit::EffectChain *chain;
+               std::function<void()> setup_chain;
 
-       void set_input_textures(int signal_num, GLuint tex_y, GLuint tex_cbcr) {
-               input_textures[signal_num].tex_y = tex_y;
-               input_textures[signal_num].tex_cbcr = tex_cbcr;
-       }
-       int get_num_channels() { return num_channels; }
+               // May have duplicates.
+               std::vector<RefCountedFrame> input_frames;
+       };
+
+       Chain get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state);
+
+       int get_num_channels() const { return num_channels; }
+       int map_signal(int signal_num);
        std::string get_channel_name(unsigned channel);
        bool get_supports_set_wb(unsigned channel);
        void set_wb(unsigned channel, double r, double g, double b);
@@ -60,14 +66,14 @@ private:
        void register_class(const char *class_name, const luaL_Reg *funcs);
 
        std::mutex m;
-       lua_State *L;
+       lua_State *L;  // Protected by <m>.
+       const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
-       struct {
-               GLuint tex_y = 0, tex_cbcr = 0;
-       } input_textures[MAX_CARDS];
        int num_channels;
        unsigned num_cards;
        std::set<int> signals_warned_about;
+
+       friend class LiveInputWrapper;
 };
 
 class LiveInputWrapper {