Changeset 1108 for trunk/src/video.cppTweet

Timestamp:

Dec 10, 2011, 3:02:12 PM (11 years ago)

Author:

sam

Message:

gl: cache viewport size on all platforms, because we cannot query it from
the game thread.

File:

• trunk/src/video.cpp (modified) (4 diffs)

trunk/src/video.cpp

@@ -36 +36 @@
 private:
     static mat4 proj_matrix, view_matrix;
-#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
     static ivec2 saved_viewport;
-#endif
 };
 
@@ -44 +42 @@
 mat4 VideoData::view_matrix;
 
-#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
 ivec2 VideoData::saved_viewport(0, 0);
-#endif
 
 /*
@@ -66 +62 @@
     /* Initialise OpenGL */
     glViewport(0, 0, size.x, size.y);
-
-#if defined __ANDROID__ || defined __CELLOS_LV2__ || defined __APPLE__
     VideoData::saved_viewport = size;
-#endif
 
     glClearColor(0.1f, 0.2f, 0.3f, 1.0f);
@@ -179 +172 @@
 ivec2 Video::GetSize()
 {
-#if defined __ANDROID__
+    /* GetSize() is called too often on the game thread; we cannot rely on
+     * the GL context at this point */
+#if 1
     return VideoData::saved_viewport;
 #elif defined __CELLOS_LV2__
     // FIXME: use psglCreateDeviceAuto && psglGetDeviceDimensions
-    return VideoData::saved_viewport;
-#elif defined __APPLE__
-    return VideoData::saved_viewport;
 #else
     GLint v[4];