Commit 48728f3b authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Remove fixqopengl.h

Qt stopped defining GLdouble type on uncontrolled ES2 platforms since
version 5.4.
parent 6b2e6cfd
/*
KWin - the KDE window manager
This file is part of the KDE project.
SPDX-FileCopyrightText: 2018 Bhushan Shah <bshah@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef FIXQOPENGL_H
#define FIXQOPENGL_H
// qopengl.h declares GLdouble as a typedef of float when Qt is built
// with GLES support. This conflicts with the epoxy/gl_generated.h
// declaration, so we have to prevent the Qt header from being #included.
#define QOPENGL_H
#ifndef QOPENGLF_APIENTRY
#define QOPENGLF_APIENTRY GLAPIENTRY
#endif
#ifndef QOPENGLF_APIENTRYP
#define QOPENGLF_APIENTRYP GLAPIENTRYP
#endif
#endif //FIXQOPENGL_H
......@@ -11,7 +11,6 @@
#include <kwin_export.h>
#include <kwinglobals.h>
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include "input.h"
#include <QImage>
......
......@@ -11,7 +11,6 @@
#define KWIN_QPA_BACKINGSTORE_H
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <qpa/qplatformbackingstore.h>
......
......@@ -10,7 +10,6 @@
#pragma once
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <QSurfaceFormat>
......
......@@ -11,7 +11,6 @@
#pragma once
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <qpa/qplatformopenglcontext.h>
......
......@@ -11,7 +11,6 @@
#define KWIN_QPA_INTEGRATION_H
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <qpa/qplatformintegration.h>
#include <QObject>
......
......@@ -10,7 +10,6 @@
#pragma once
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <qpa/qplatformoffscreensurface.h>
......
......@@ -11,7 +11,6 @@
#define KWIN_QPA_WINDOW_H
#include <epoxy/egl.h>
#include "fixqopengl.h"
#include <QPointer>
#include <qpa/qplatformwindow.h>
......
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