comparison: src/glShared.h
src/glShared.h
- changeset 856
- 6bdc03091441
- parent 855
- e16f1587ef44
- child 885
- 9c4fc9b433ae
equal
deleted
inserted
replaced
| 855:e16f1587ef44 | 856:6bdc03091441 |
|---|---|
| 15 * You should have received a copy of the GNU General Public License | 15 * You should have received a copy of the GNU General Public License |
| 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 */ | 17 */ |
| 18 | 18 |
| 19 #pragma once | 19 #pragma once |
| 20 #include <QOpenGLFunctions> | 20 |
| 21 #ifdef USE_QT5 | |
| 22 # include <QOpenGLFunctions> | |
| 23 #endif | |
| 24 | |
| 21 #include "basics.h" | 25 #include "basics.h" |
| 22 | 26 |
| 23 class LDObject; | 27 class LDObject; |
| 24 | 28 |
| 25 struct LDPolygon | 29 struct LDPolygon |
| 60 }; | 64 }; |
| 61 | 65 |
| 62 NUMERIC_ENUM_OPERATORS (EVBOSurface) | 66 NUMERIC_ENUM_OPERATORS (EVBOSurface) |
| 63 NUMERIC_ENUM_OPERATORS (EVBOComplement) | 67 NUMERIC_ENUM_OPERATORS (EVBOComplement) |
| 64 | 68 |
| 69 #ifndef USE_QT5 | |
| 70 // Placeholder QOpenGLFunctions for Qt 4.x support | |
| 71 struct QOpenGLFunctions | |
| 72 { | |
| 73 void initializeOpenGLFunctions() {} | |
| 74 }; | |
| 75 | |
| 76 #endif | |
| 77 | |
| 65 // KDevelop doesn't seem to understand some VBO stuff | 78 // KDevelop doesn't seem to understand some VBO stuff |
| 66 #ifdef IN_IDE_PARSER | 79 #ifdef IN_IDE_PARSER |
| 67 using GLint = int; | 80 using GLint = int; |
| 68 using GLsizei = int; | 81 using GLsizei = int; |
| 69 using GLenum = unsigned int; | 82 using GLenum = unsigned int; |
