diff options
Diffstat (limited to 'config.tests/unix')
-rw-r--r-- | config.tests/unix/harfbuzz/harfbuzz.cpp | 2 | ||||
-rw-r--r-- | config.tests/unix/iwmmxt/iwmmxt.pro | 4 | ||||
-rw-r--r-- | config.tests/unix/opengles3/opengles3.cpp | 57 | ||||
-rw-r--r-- | config.tests/unix/opengles3/opengles3.pro | 16 | ||||
-rw-r--r-- | config.tests/unix/opengles31/opengles31.cpp (renamed from config.tests/unix/iwmmxt/iwmmxt.cpp) | 10 | ||||
-rw-r--r-- | config.tests/unix/opengles31/opengles31.pro | 13 | ||||
-rw-r--r-- | config.tests/unix/pcre/pcre.cpp | 2 |
7 files changed, 94 insertions, 10 deletions
diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp index 9e26b04499..43daf48344 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.cpp +++ b/config.tests/unix/harfbuzz/harfbuzz.cpp @@ -41,7 +41,7 @@ #include <harfbuzz/hb.h> -#if ((HB_VERSION_MAJOR*10000 + HB_VERSION_MINOR*100 + HB_VERSION_MICRO) < 912) +#if !HB_VERSION_ATLEAST(0, 9, 31) # error "This version of harfbuzz is too old." #endif diff --git a/config.tests/unix/iwmmxt/iwmmxt.pro b/config.tests/unix/iwmmxt/iwmmxt.pro deleted file mode 100644 index f463176d5c..0000000000 --- a/config.tests/unix/iwmmxt/iwmmxt.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = iwmmxt.cpp -CONFIG -= x11 qt -isEmpty(QMAKE_CFLAGS_IWMMXT):error("This compiler does not support iWMMXt") -else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_IWMMXT diff --git a/config.tests/unix/opengles3/opengles3.cpp b/config.tests/unix/opengles3/opengles3.cpp new file mode 100644 index 0000000000..d82dca4416 --- /dev/null +++ b/config.tests/unix/opengles3/opengles3.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifdef BUILD_ON_MAC + #include <OpenGLES/ES3/gl.h> +#else + #include <GLES3/gl3.h> +#endif + +int main(int, char **) +{ + glGetStringi(GL_EXTENSIONS, 0); + glReadBuffer(GL_COLOR_ATTACHMENT1); + static GLfloat f[6]; + glUniformMatrix2x3fv(0, 0, GL_FALSE, f); + glMapBufferRange(GL_ARRAY_BUFFER, 0, 0, GL_MAP_READ_BIT); + + return 0; +} diff --git a/config.tests/unix/opengles3/opengles3.pro b/config.tests/unix/opengles3/opengles3.pro new file mode 100644 index 0000000000..6942b57327 --- /dev/null +++ b/config.tests/unix/opengles3/opengles3.pro @@ -0,0 +1,16 @@ +# The library is expected to be the same as in ES 2.0 (libGLESv2). +# The difference is the header and the presence of the functions in +# the library. + +SOURCES = opengles3.cpp +INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 + +for(p, QMAKE_LIBDIR_OPENGL_ES2) { + exists($$p):LIBS += -L$$p +} + +CONFIG -= qt +LIBS += $$QMAKE_LIBS_OPENGL_ES2 +mac { + DEFINES += BUILD_ON_MAC +} diff --git a/config.tests/unix/iwmmxt/iwmmxt.cpp b/config.tests/unix/opengles31/opengles31.cpp index 908c6f835b..c4f27a3be8 100644 --- a/config.tests/unix/iwmmxt/iwmmxt.cpp +++ b/config.tests/unix/opengles31/opengles31.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the config.tests of the Qt Toolkit. @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include <mmintrin.h> +#include <GLES3/gl31.h> -int main(int, char**) +int main(int, char **) { - _mm_unpackhi_pi16(_mm_setzero_si64(), _mm_setzero_si64()); + glDispatchCompute(1, 1, 1); + glProgramUniform1i(0, 0, 0); + return 0; } diff --git a/config.tests/unix/opengles31/opengles31.pro b/config.tests/unix/opengles31/opengles31.pro new file mode 100644 index 0000000000..1df9cedfcd --- /dev/null +++ b/config.tests/unix/opengles31/opengles31.pro @@ -0,0 +1,13 @@ +# The library is expected to be the same as in ES 2.0 (libGLESv2). +# The difference is the header and the presence of the functions in +# the library. + +SOURCES = opengles31.cpp +INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 + +for(p, QMAKE_LIBDIR_OPENGL_ES2) { + exists($$p):LIBS += -L$$p +} + +CONFIG -= qt +LIBS += $$QMAKE_LIBS_OPENGL_ES2 diff --git a/config.tests/unix/pcre/pcre.cpp b/config.tests/unix/pcre/pcre.cpp index 9c765715d3..bb13106c1e 100644 --- a/config.tests/unix/pcre/pcre.cpp +++ b/config.tests/unix/pcre/pcre.cpp @@ -41,7 +41,7 @@ #include <pcre.h> -#if (PCRE_MAJOR < 8) || ((PCRE_MAJOR == 8) && (PCRE_MINOR < 30)) +#if (PCRE_MAJOR < 8) || ((PCRE_MAJOR == 8) && (PCRE_MINOR < 31)) #error This PCRE version is not supported #endif |