Merge branch 'master' into epoxy

[movit] / README

diff --git a/README b/README
index f7017bdfbf8babda12f667cda94793f42d6332c0..74be5e5f17bdb8af1d65ba1ded439a35e273ba90 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,
   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], [FFTW3] and [Google Test] libraries. (The library itself
   does not depend on the latter, but you probably want to run the unit tests.)
 * The [Eigen 3], [FFTW3] and [Google Test] libraries. (The library itself
   does not depend on the latter, 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
   platforms.
 
 Movit has been tested with Intel GPUs with the Mesa drivers


@@ -54,7 +55,8 @@ all research-grade problems, and Movit is currently not there.)
 TL;DR, but I am interested in a programming example instead
 ===========================================================
 
 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;
 
 <code>
   using namespace movit;