Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/ghost/test/gears')
-rw-r--r--intern/ghost/test/gears/GHOST_C-Test.c34
-rw-r--r--intern/ghost/test/gears/GHOST_Test.cpp17
2 files changed, 27 insertions, 24 deletions
diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c
index 00ae4bb25b4..c635ab9be5b 100644
--- a/intern/ghost/test/gears/GHOST_C-Test.c
+++ b/intern/ghost/test/gears/GHOST_C-Test.c
@@ -448,6 +448,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
int main(int argc, char **argv)
{
+ GHOST_GLSettings glSettings = {0};
char *title1 = "gears - main window";
char *title2 = "gears - secondary window";
GHOST_EventConsumerHandle consumer = GHOST_CreateEventConsumer(processEvent, NULL);
@@ -459,16 +460,12 @@ int main(int argc, char **argv)
if (shSystem)
{
/* Create the main window */
- sMainWindow = GHOST_CreateWindow(shSystem,
- title1,
- 10,
- 64,
- 320,
- 200,
- GHOST_kWindowStateNormal,
- GHOST_kDrawingContextTypeOpenGL,
- FALSE,
- FALSE);
+ sMainWindow = GHOST_CreateWindow(
+ shSystem, title1,
+ 10, 64, 320, 200,
+ GHOST_kWindowStateNormal,
+ GHOST_kDrawingContextTypeOpenGL,
+ glSettings);
if (!sMainWindow)
{
printf("could not create main window\n");
@@ -476,16 +473,13 @@ int main(int argc, char **argv)
}
/* Create a secondary window */
- sSecondaryWindow = GHOST_CreateWindow(shSystem,
- title2,
- 340,
- 64,
- 320,
- 200,
- GHOST_kWindowStateNormal,
- GHOST_kDrawingContextTypeOpenGL,
- FALSE,
- FALSE);
+ sSecondaryWindow = GHOST_CreateWindow(
+ shSystem,
+ title2,
+ 340, 64, 320, 200,
+ GHOST_kWindowStateNormal,
+ GHOST_kDrawingContextTypeOpenGL,
+ glSettings);
if (!sSecondaryWindow)
{
printf("could not create secondary window\n");
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index a81aaa85ecf..d6c8f25707c 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -418,12 +418,17 @@ Application::Application(GHOST_ISystem *system)
m_gearsTimer(0), m_testTimer(0), m_cursor(GHOST_kStandardCursorFirstCursor),
m_exitRequested(false), stereo(false)
{
+ GHOST_GLSettings glSettings = {0};
fApp = this;
// Create the main window
STR_String title1("gears - main window");
- m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal,
- GHOST_kDrawingContextTypeOpenGL, false, false);
+ m_mainWindow = system->createWindow(
+ title1,
+ 10, 64, 320, 200,
+ GHOST_kWindowStateNormal,
+ GHOST_kDrawingContextTypeOpenGL,
+ glSettings);
if (!m_mainWindow) {
std::cout << "could not create main window\n";
@@ -432,8 +437,12 @@ Application::Application(GHOST_ISystem *system)
// Create a secondary window
STR_String title2("gears - secondary window");
- m_secondaryWindow = system->createWindow(title2, 340, 64, 320, 200, GHOST_kWindowStateNormal,
- GHOST_kDrawingContextTypeOpenGL, false, false);
+ m_secondaryWindow = system->createWindow(
+ title2,
+ 340, 64, 320, 200,
+ GHOST_kWindowStateNormal,
+ GHOST_kDrawingContextTypeOpenGL,
+ glSettings);
if (!m_secondaryWindow) {
std::cout << "could not create secondary window\n";
exit(-1);