Merge branch 'master' into epoxy

[movit] / README

diff --git a/README b/README
index b2c6af9a6114abecff5e0b885320a4df24a2e5c3..81bb4c99e2f8428cca5b417c6fd7801c17a57103 100644 (file)
--- a/README
+++ b/README
@@ -21,12 +21,13 @@ OK, you need
   works fine on Linux and OS X, and Movit is not very POSIX-bound.)
 * GNU Make.
 * A GPU capable of running GLSL fragment shaders,
-  process floating-point textures, and a few other things. If your machine
-  is less than five years old _and you have the appropriate drivers_,
-  you're home free.
+  processing floating-point textures, and a few other things (all are
+  part of OpenGL 3.0 or newer, although most OpenGL 2.0 cards also
+  have what's needed through extensions). If your machine is less than five
+  years old _and you have the appropriate drivers_, you're home free.
 * The [Eigen 3] and [Google Test] libraries. (The library itself
   depends only on the former, but you probably want to run the unit tests.)
-* The [GLEW] library, for dealing with OpenGL extensions on various
+* The [epoxy] library, for dealing with OpenGL extensions on various
   platforms.
 
 Movit has been tested with Intel GPUs with the Mesa drivers
@@ -53,9 +54,11 @@ all research-grade problems, and Movit is currently not there.)
 TL;DR, but I am interested in a programming example instead
 ===========================================================
 
-Assuming you have an OpenGL context already set up:
+Assuming you have an OpenGL context already set up (currently you need
+a classic OpenGL context; a GL 3.2+ core context won't do):
 
 <code>
+  using namespace movit;
   EffectChain chain(1280, 720);
 
   ImageFormat inout_format;
@@ -88,12 +91,12 @@ OK, I can read a bit. What do you mean by “modern”?
 Backwards compatibility is fine and all, but sometimes we can do better
 by observing that the world has moved on. In particular:
 
-* It's 2012, so people want to edit HD video.
-* It's 2012, so everybody has a GPU.
-* It's 2012, so everybody has a working C++ compiler.
+* It's 2014, so people want to edit HD video.
+* It's 2014, so everybody has a GPU.
+* It's 2014, so everybody has a working C++ compiler.
   (Even Microsoft fixed theirs around 2003!)
 
-While from a programming standpoint I'd love to say that it's 2012
+While from a programming standpoint I'd love to say that it's 2014
 and interlacing does no longer exist, but that's not true (and interlacing,
 hated as it might be, is actually a useful and underrated technique for
 bandwidth reduction in broadcast video). Movit will eventually provide
@@ -153,9 +156,10 @@ instead of on input? And I can promise you that once we move to more
 wide-gamut color spaces, like the one in Rec. 2020 (used for UHDTV), the
 difference will be anything but subtle. As of [why working in linear
 light matters](http://www.4p8.com/eric.brasseur/gamma.html),
-others have explained it better than I can; note also
-that this makes Movit future-proof when the world moves towards 10-
-and 12-bit color precision. The extra power from the GPU makes all of this
+others have explained it better than I can; note also that this makes Movit
+future-proof when the world moves towards 10- and 12-bit color precision
+(although the latter requires Movit to change from 16-bit to 32-bit floating
+point, it is a simple switch). The extra power from the GPU makes all of this
 simple, so do we not need to make too many concessions for the sake of speed.
 
 Movit does not currently do ICC profiles or advanced gamut mapping;