summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-12-14 09:49:17 -0800
committerEric Anholt <eric@anholt.net>2017-12-14 09:51:51 -0800
commit2d3a955c77787f24be1382686056b06099a7237a (patch)
treef3c7f724fd066aef9074f57364c9c108702af406
parent61436ecbf644a26292b68f6e2d0344cada19b051 (diff)
retrace: Fix build errors from trying to use both GLES2 and GL2 headers.frameretrace
-rw-r--r--retrace/daemon/framestat/glframe_loop.cpp2
-rw-r--r--retrace/daemon/gldispatch/glframe_glhelper.hpp2
-rw-r--r--retrace/daemon/glframe_retrace.cpp3
3 files changed, 4 insertions, 3 deletions
diff --git a/retrace/daemon/framestat/glframe_loop.cpp b/retrace/daemon/framestat/glframe_loop.cpp
index 4f8c5dd5..9bdde76f 100644
--- a/retrace/daemon/framestat/glframe_loop.cpp
+++ b/retrace/daemon/framestat/glframe_loop.cpp
@@ -27,7 +27,7 @@
#include "glframe_loop.hpp"
-#include <GLES2/gl2.h>
+#include <GL/gl.h>
#include <sstream>
#include <string>
diff --git a/retrace/daemon/gldispatch/glframe_glhelper.hpp b/retrace/daemon/gldispatch/glframe_glhelper.hpp
index a59b9689..1f81e914 100644
--- a/retrace/daemon/gldispatch/glframe_glhelper.hpp
+++ b/retrace/daemon/gldispatch/glframe_glhelper.hpp
@@ -30,8 +30,8 @@
#include <stdio.h>
-#include <GLES2/gl2.h>
#include <GL/gl.h>
+#include <GL/glext.h>
#include <string>
#include <vector>
diff --git a/retrace/daemon/glframe_retrace.cpp b/retrace/daemon/glframe_retrace.cpp
index 787fe318..0528571f 100644
--- a/retrace/daemon/glframe_retrace.cpp
+++ b/retrace/daemon/glframe_retrace.cpp
@@ -27,7 +27,8 @@
#include "glframe_retrace.hpp"
-#include <GLES2/gl2.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
#include <fcntl.h>
#include <stdio.h>