add egl3test

[gltest.git] / gltest.cpp

diff --git a/gltest.cpp b/gltest.cpp
index 8d296a3991965e965e0c3ac1e7e0c03eba4a6c53..edc17f85851036a86730db2ee3752cb4301954ed 100644 (file)
--- a/gltest.cpp
+++ b/gltest.cpp
@@ -1,3 +1,21 @@
+/* gltest - small OpenGL tearing test program
+ * Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+

 // stdlib includes
 #include <time.h>
 #include <stdio.h>
 // stdlib includes
 #include <time.h>
 #include <stdio.h>


@@ -6,22 +24,23 @@
 #include <limits.h>
 #include <unistd.h>
 #include <assert.h>
 #include <limits.h>
 #include <unistd.h>
 #include <assert.h>

-#include <GL/gl.h>

 #include <boost/program_options.hpp>
 
 namespace po = boost::program_options;
 
 #include <boost/program_options.hpp>
 
 namespace po = boost::program_options;
 

-// include proper GL connector
+// my GL utility functions and the GL window class
+#include "glutil.h"

 #include "glwindow.h"
 #include "glwindow.h"

-#if defined(USE_GLX)
+// include proper GL backend (windowing system)
+#if defined(WIN_GLX)

 #include "glxbackend.h"
 #include "glxbackend.h"

-GLBackend *createGLBackend()
+static GLBackend *createGLBackend()

 {
        return new GLXBackend();
 }
 {
        return new GLXBackend();
 }

-#elif defined(USE_EGL)
+#elif defined(WIN_EGL)

 #include "eglbackend.h"
 #include "eglbackend.h"

-GLBackend *createGLBackend()
+static GLBackend *createGLBackend()

 {
        return new EGLBackend();
 }
 {
        return new EGLBackend();
 }


@@ -30,12 +49,12 @@ GLBackend *createGLBackend()
 #endif
 
 // configuration
 #endif
 
 // configuration

-const GLfloat boxWidth = 0.045f;
-const GLfloat boxSpeed = 1.25f; // per second
+static const GLfloat boxWidth = 0.045f;
+static const GLfloat boxSpeed = 1.25f; // per second

 
 // profiler
 
 // profiler

-const int numProfilerStates = 5;
-const char *profilerStateNames[numProfilerStates] = { "Pre-Render", "Drawing", "Swapping", "Post-Render", "Outside renderer"};
+enum ProfilerState { StatePreRender, StateClear, StateDraw, StatePresent, StatePostRender, StateOutsideRender, NumProfilerStates };
+static const char *profilerStateNames[NumProfilerStates] = { "Pre-Render", "Clearing", "Drawing", "Presenting", "Post-Render", "Outside renderer"};

 
 // utility functions
 static double getTime()
 
 // utility functions
 static double getTime()


@@ -45,20 +64,29 @@ static double getTime()
        return tp.tv_sec + 1e-9 * tp.tv_nsec;
 }
 
        return tp.tv_sec + 1e-9 * tp.tv_nsec;
 }
 

-static void drawRect(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
-{
-       glVertex2f(x1, y1); glVertex2f(x2, y1); glVertex2f(x2, y2); glVertex2f(x1, y2);
-}
-

 // the window
 class TearTestWindow : public GLWindow {
 public:
 // the window
 class TearTestWindow : public GLWindow {
 public:

-       TearTestWindow() : GLWindow(XOpenDisplay(0), createGLBackend()), boxPos(0), boxDirection(1)
+       TearTestWindow() : GLWindow(XOpenDisplay(0), createGLBackend()),
+               overdraw(false), sleep_time(0), boxPos(0), boxDirection(1)

        {}
 
        {}
 

-       void setSwapInterval(int i) {
-               getBackend()->setSwapInterval(i);
-       }
+       void setOverdraw(bool overdraw) { this->overdraw = overdraw; }
+       void setSleepTime(int sleep_time) { this->sleep_time = sleep_time; }
+
+       void setSwapInterval(int i) { getBackend()->setSwapInterval(i); }
+
+private:
+       bool overdraw;
+       int sleep_time;
+       // animation control
+       double lastFrame;
+       GLfloat boxPos, boxDirection;
+       // FPS, profiler
+       double lastDisplay, lastProfile;                 
+       int framect;
+       ProfilerState curState;
+       double stateTime[NumProfilerStates];

 
 protected:
        virtual void initGL()
 
 protected:
        virtual void initGL()


@@ -71,29 +99,22 @@ protected:
                // initailize profiler
                framect = 0;
                memset(stateTime, 0, sizeof(stateTime));
                // initailize profiler
                framect = 0;
                memset(stateTime, 0, sizeof(stateTime));

-               curState = -1;
+               curState = NumProfilerStates;

                lastDisplay = lastProfile = getTime();
        }
        
        virtual void resizeGL(unsigned int width, unsigned int height)
        {
                lastDisplay = lastProfile = getTime();
        }
        
        virtual void resizeGL(unsigned int width, unsigned int height)
        {

-               /* prevent divide-by-zero */                      
-               if (height == 0)                                  
-                       height = 1;                                   

                glViewport(0, 0, width, height);
                glViewport(0, 0, width, height);

-               glMatrixMode(GL_PROJECTION);                      
-               glLoadIdentity();                                 
-               glOrtho (0, 1, 1, 0, 0, 1);
-               glMatrixMode(GL_MODELVIEW);      
-               glClear(GL_COLOR_BUFFER_BIT);                                                 
-               glFlush();
+               initialise2dProjection();
+               glClearColor(0.0f, 0.0f, 0.0f, 0.0f);

        }
        
        }
        

-       void profilerTick(int nextState)
+       void profilerTick(ProfilerState nextState)

        {
        {

-               assert (nextState >= 0 && nextState < numProfilerStates);
+               assert (nextState >= 0 && nextState < NumProfilerStates);

                double time = getTime();
                double time = getTime();

-               if (curState >= 0)
+               if (curState >= 0 && curState < NumProfilerStates)

                        stateTime[curState] += time-lastProfile;
                curState = nextState;
                lastProfile = time;
                        stateTime[curState] += time-lastProfile;
                curState = nextState;
                lastProfile = time;


@@ -101,7 +122,7 @@ protected:
                const double elapsed = time-lastDisplay;
                if (elapsed >= 3) {
                        printf("%.1f fps, time spent: ", framect/elapsed);
                const double elapsed = time-lastDisplay;
                if (elapsed >= 3) {
                        printf("%.1f fps, time spent: ", framect/elapsed);

-                       for (int i = 0; i < numProfilerStates; ++i) {
+                       for (int i = 0; i < NumProfilerStates; ++i) {

                                if (i != 0) printf(", ");
                                printf("%s %.1f%%", profilerStateNames[i], stateTime[i]/elapsed*100);
                        }
                                if (i != 0) printf(", ");
                                printf("%s %.1f%%", profilerStateNames[i], stateTime[i]/elapsed*100);
                        }


@@ -113,8 +134,9 @@ protected:
        }
        
        void renderGL()
        }
        
        void renderGL()

-       {                            
-               profilerTick(0);
+       {              
+               //////////////////////////////////////////////
+               profilerTick(StatePreRender);

                double time = getTime();
                // anim
                double passedTime = time-lastFrame;
                double time = getTime();
                // anim
                double passedTime = time-lastFrame;


@@ -130,37 +152,28 @@ protected:
                        }
                }
                lastFrame = time;
                        }
                }
                lastFrame = time;

-               // draw
-               //glFlush();
-               profilerTick(1);
-               //glClear(GL_COLOR_BUFFER_BIT);
-               glBegin(GL_QUADS);
-               // clear manually
-               glColor3f(0.0f, 0.0f, 0.0f);
-               drawRect(0, 0, 1, 1);
-               glColor3f(0.8f, 1.0f, 0.75f);
-               drawRect(boxPos, 0, boxPos+boxWidth, 1);
-               glEnd();
-               usleep(20*1000);
-               profilerTick(2);
+               //////////////////////////////////////////////
+               profilerTick(StateClear);
+               if (overdraw) {
+                       // clear manually
+                       drawQuad(/*color*/0.0f, 0.0f, 0.0f, /*coordinates*/0, 0, 1, 1);
+               }
+               else {
+                       glClear(GL_COLOR_BUFFER_BIT);
+               }
+               //////////////////////////////////////////////
+               profilerTick(StateDraw);
+               drawQuad(/*color*/0.8f, 1.0f, 0.75f, /*coordinates*/boxPos, 0, boxPos+boxWidth, 1);
+               usleep(sleep_time*1000);
+               //////////////////////////////////////////////
+               profilerTick(StatePresent);

                getBackend()->swapBuffers();
                getBackend()->swapBuffers();

-//             glDrawBuffer(GL_FRONT);
-//             int xpos = 0;
-//             int ypos = 0;
-               //foreach (const QRect &r, region.rects()) {
-                       // convert to OpenGL coordinates
-                       //int y = displayHeight() - 0 - r.height();
-//                     glBitmap(0, 0, 0, 0, 0 - xpos, 0 - ypos, NULL); // not glRasterPos2f, see glxbackend.cpp
-//                     xpos = 0;
-//                     ypos = 0;
-//                     glCopyPixels(0, 0, getWidth(), getHeight(), GL_COLOR);
-               //}
-//             glBitmap(0, 0, 0, 0, -xpos, -ypos, NULL); // move position back to 0,0
-//             glDrawBuffer(GL_BACK);
-               profilerTick(3);
-               glFlush();
+               //////////////////////////////////////////////
+               profilerTick(StatePostRender);
+               glFinish();

                ++framect;
                ++framect;

-               profilerTick(4);
+               //////////////////////////////////////////////
+               profilerTick(StateOutsideRender);

        }
        
        virtual void handleKeyPress(KeySym key)
        }
        
        virtual void handleKeyPress(KeySym key)


@@ -171,18 +184,8 @@ protected:
                        default: break;
                }
        }
                        default: break;
                }
        }

-
-private:
-       double lastFrame;
-       GLfloat boxPos, boxDirection;
-       // FPS
-       double lastDisplay, lastProfile;                 
-       int framect, curState;
-       double stateTime[numProfilerStates];

 };
 
 };
 

-
-

 int main(int argc, char ** argv)
 {
        // program options handling
 int main(int argc, char ** argv)
 {
        // program options handling


@@ -190,6 +193,8 @@ int main(int argc, char ** argv)
        desc.add_options()
                ("help,h", "produce help message")
                ("swap-interval,i", po::value<int>(), "set swap interval")
        desc.add_options()
                ("help,h", "produce help message")
                ("swap-interval,i", po::value<int>(), "set swap interval")

+               ("overdraw,o", "overdraw previous image (instead of calling glClear)")
+               ("sleep,s", po::value<int>()->default_value(0), "Number of milliseconds to sleap in each frame (in the drawing phase)")

        ;
        po::variables_map vm;
        po::store(po::parse_command_line(argc, argv, desc), vm);
        ;
        po::variables_map vm;
        po::store(po::parse_command_line(argc, argv, desc), vm);


@@ -202,6 +207,8 @@ int main(int argc, char ** argv)
 
        // actual program
        TearTestWindow w;
 
        // actual program
        TearTestWindow w;

+       w.setOverdraw(vm.count("overdraw"));
+       w.setSleepTime(vm["sleep"].as<int>());

        w.open(800, 600);
        if (vm.count("swap-interval"))
                w.setSwapInterval(vm["swap-interval"].as<int>());
        w.open(800, 600);
        if (vm.count("swap-interval"))
                w.setSwapInterval(vm["swap-interval"].as<int>());