Kaydet (Commit) 2703f4d8 authored tarafından David Tardon's avatar David Tardon

continue to support glew 1.10

Change-Id: I951c04e7d0039f1e38e3bcb2ea7e0f7c33293b9b
üst f3b51162
/*
Settings for OpenGL
*/
#ifndef CONFIG_OPENGL_H
#define CONFIG_OPENGL_H
#undef HAVE_GLEW_1_12
#endif
......@@ -8699,6 +8699,9 @@ dnl ===================================================================
dnl Check for system glew
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([glew], [GLEW], [glew >= 1.10.0])
AS_IF([test "$with_system_glew" = "yes"],
[PKG_CHECK_EXISTS([glew >= 1.12.0], [AC_DEFINE([HAVE_GLEW_1_12])])],
[AC_DEFINE([HAVE_GLEW_1_12])])
dnl ===================================================================
dnl Check for system vigra
......@@ -13075,6 +13078,7 @@ AC_CONFIG_HEADERS([config_host/config_orcus.h])
AC_CONFIG_HEADERS([config_host/config_kde4.h])
AC_CONFIG_HEADERS([config_host/config_mingw.h])
AC_CONFIG_HEADERS([config_host/config_oox.h])
AC_CONFIG_HEADERS([config_host/config_opengl.h])
AC_CONFIG_HEADERS([config_host/config_options.h])
AC_CONFIG_HEADERS([config_host/config_test.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <config_opengl.h>
#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/syschild.hxx>
......@@ -437,7 +439,13 @@ extern "C" void
APIENTRY
#endif
debug_callback(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei , const GLchar* message, const GLvoid* )
GLenum severity, GLsizei , const GLchar* message,
#if defined HAVE_GLEW_1_12
const GLvoid*
#else
GLvoid*
#endif
)
{
// ignore Nvidia's : "Program/shader state performance warning: Fragment Shader is going to be recompiled because the shader key based on GL state mismatches."
// the GLSL compiler is a bit too aggressive in optimizing the state based on the current OpenGL state
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment