Commit eaa4300faf5f0c280a24a7d1f1f3f655f984087a
2013-10-09T11:30:01
Fixes testgles and testgl
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
diff --git a/test/Makefile.in b/test/Makefile.in
index ed0fce3..12c3f0d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -124,7 +124,7 @@ testgl2$(EXE): $(srcdir)/testgl2.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLLIB@ @MATHLIB@
testgles$(EXE): $(srcdir)/testgles.c
- $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLLIB@ @MATHLIB@
+ $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLESLIB@ @MATHLIB@
testhaptic$(EXE): $(srcdir)/testhaptic.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
diff --git a/test/configure b/test/configure
index d69cb43..1e33409 100755
--- a/test/configure
+++ b/test/configure
@@ -587,6 +587,7 @@ LIBOBJS
SDL_TTF_LIB
XLIB
GLLIB
+GLESLIB
CPP
XMKMF
SDL_CONFIG
@@ -3785,7 +3786,7 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
@@ -3793,10 +3794,11 @@ if test x$have_x = xyes; then
if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
- XPATH="-L$ac_x_libraries"
if test "x$ac_x_libraries" = x; then
+ XPATH=""
XLIB="-lX11"
else
+ XPATH="-L$ac_x_libraries"
XLIB="-L$ac_x_libraries -lX11"
fi
fi
@@ -3859,14 +3861,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$have_opengles" >&6; }
GLLIB=""
+GLESLIB=""
if test x$have_opengles = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGLES"
- GLLIB="$XPATH -lGLESv1_CM"
-elif test x$have_opengl = xyes; then
+ GLESLIB="$XPATH -lGLESv1_CM"
+fi
+if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$XPATH $SYS_GL_LIBS"
-else
- GLLIB=""
fi
diff --git a/test/configure.in b/test/configure.in
index 7fb496a..a186097 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -91,7 +91,7 @@ LIBS="$LIBS $SDL_LIBS -lSDL2_test"
dnl Check for X11 path, needed for OpenGL on some systems
AC_PATH_X
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
@@ -99,10 +99,11 @@ if test x$have_x = xyes; then
if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
- XPATH="-L$ac_x_libraries"
if test "x$ac_x_libraries" = x; then
+ XPATH=""
XLIB="-lX11"
else
+ XPATH="-L$ac_x_libraries"
XLIB="-L$ac_x_libraries -lX11"
fi
fi
@@ -135,17 +136,18 @@ have_opengles=yes
AC_MSG_RESULT($have_opengles)
GLLIB=""
+GLESLIB=""
if test x$have_opengles = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGLES"
- GLLIB="$XPATH -lGLESv1_CM"
-elif test x$have_opengl = xyes; then
+ GLESLIB="$XPATH -lGLESv1_CM"
+fi
+if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$XPATH $SYS_GL_LIBS"
-else
- GLLIB=""
fi
AC_SUBST(GLLIB)
+AC_SUBST(GLESLIB)
AC_SUBST(XLIB)
dnl Check for SDL_ttf
diff --git a/test/testgles.c b/test/testgles.c
index daaa28c..69322a2 100644
--- a/test/testgles.c
+++ b/test/testgles.c
@@ -159,6 +159,8 @@ main(int argc, char *argv[])
state->gl_green_size = 5;
state->gl_blue_size = 5;
state->gl_depth_size = depth;
+ state->gl_major_version = 1;
+ state->gl_minor_version = 1;
if (fsaa) {
state->gl_multisamplebuffers=1;
state->gl_multisamplesamples=fsaa;
@@ -177,6 +179,8 @@ main(int argc, char *argv[])
}
/* Create OpenGL ES contexts */
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+
for (i = 0; i < state->num_windows; i++) {
context[i] = SDL_GL_CreateContext(state->windows[i]);
if (!context[i]) {