From 235129deb80b5447a41ea570f0a08954bbdca3be Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 28 Jul 2010 14:32:21 +0000 Subject: [PATCH] Ooops, should not have been commited yet. Sorry. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37788 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/mesa/glut/Jamfile | 2 +- src/libs/mesa/glut/glutState.h | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/libs/mesa/glut/Jamfile b/src/libs/mesa/glut/Jamfile index 7f80af4e0e..1d97dab96c 100644 --- a/src/libs/mesa/glut/Jamfile +++ b/src/libs/mesa/glut/Jamfile @@ -20,7 +20,7 @@ MergeObject glut.o : glutCursor.cpp glutMenu.cpp glutDstr.cpp - glutGameMode.cpp + # glutGameMode.cpp beos_x11.cpp # C sources diff --git a/src/libs/mesa/glut/glutState.h b/src/libs/mesa/glut/glutState.h index aaa85cc57a..b6d1920c84 100644 --- a/src/libs/mesa/glut/glutState.h +++ b/src/libs/mesa/glut/glutState.h @@ -28,7 +28,7 @@ struct GlutState { BApplication *display; thread_id appthread; - + int initX, initY; // initial window position int initWidth, initHeight; // initial window size unsigned int displayMode; // initial display mode @@ -36,18 +36,20 @@ struct GlutState { GlutWindow *currentWindow; // current window GlutMenu *currentMenu; // current menu - + GlutWindow **windowList; // array of pointers to windows int windowListSize; // size of window list - + GLUTidleCB idle; // idle callback GLUTmenuStatusCB menuStatus; // menu status callback int modifierKeys; // only valid during keyboard callback - int keyRepeatMode; // global repeat - + int keyRepeatMode; // global repeat + + bool gameMode; // game mode is active + bool debug; // call glGetError - bool quitAll; // quit - + bool quitAll; // quit + GlutState() { display = 0; appthread = 0;