Fixed gles2 demo by switching it from a console application to a windowed one...

gpu/command_buffer/client/gles2_demo.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file implements a standalone executable demo of using GLES2 over
 // command buffers. This code is temporary as the setup that happens
 // here is in a state of flux. Eventually there will be several versions of
 // setup, one for trusted code, one for pepper, one for NaCl, and maybe others.
 
 #include <windows.h>
@@ skipping 13 matching lines @@
 #include "gpu/command_buffer/client/gles2_demo_c.h"
 #include "gpu/command_buffer/client/gles2_demo_cc.h"
 
 using base::SharedMemory;
 using gpu::Buffer;
 using gpu::GPUProcessor;
 using gpu::CommandBufferService;
 using gpu::gles2::GLES2CmdHelper;
 using gpu::gles2::GLES2Implementation;
 
+#if defined(OS_WIN)
+HINSTANCE g_instance;
+#endif
+
 class GLES2Demo {
  public:
   GLES2Demo();
 
   bool GLES2Demo::Setup(void* hwnd, int32 size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Demo);
 };
 
@@ skipping 53 matching lines @@
       // TODO(gman): Not sure how SwapBuffer should be exposed.
       gles2::GetGLContext()->SwapBuffers();
       break;
     }
     default:
       return ::DefWindowProc(hwnd, msg, w_param, l_param);
   }
   return 0;
 }
 
-HINSTANCE GetInstance(void) {
-  HWND hwnd = GetConsoleWindow();
-  return reinterpret_cast<HINSTANCE>(GetWindowLong(hwnd, GWL_HINSTANCE));
-}
-
 void ProcessMessages(void* in_hwnd) {
   HWND hwnd = reinterpret_cast<HWND>(in_hwnd);
   MSG msg;
 
   bool done = false;
   while (!done) {
     while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
       if (msg.message == WM_QUIT) {
         done = true;
       }
       // dispatch the message
       TranslateMessage(&msg);
       DispatchMessage(&msg);
     }
     if (!done) {
       InvalidateRect(hwnd, NULL, TRUE);
     }
   }
 }
 
 #endif
 
 void* SetupWindow() {
 #if defined(OS_WIN)
-  HINSTANCE instance = GetInstance();
   WNDCLASSEX wc = {0};
   wc.lpszClassName = L"MY_WINDOWS_CLASS";
   wc.cbSize = sizeof(WNDCLASSEX);
   wc.style = CS_HREDRAW | CS_VREDRAW;
   wc.lpfnWndProc = ::WindowProc;
   wc.cbClsExtra = 0;
   wc.cbWndExtra = 0;
-  wc.hInstance = instance;
-  wc.hIcon = ::LoadIcon(instance, IDI_APPLICATION);
+  wc.hInstance = g_instance;
+  wc.hIcon = ::LoadIcon(g_instance, IDI_APPLICATION);
   wc.hIconSm = NULL;
-  wc.hCursor = ::LoadCursor(instance, IDC_ARROW);
+  wc.hCursor = ::LoadCursor(g_instance, IDC_ARROW);
   wc.hbrBackground = static_cast<HBRUSH>(::GetStockObject(BLACK_BRUSH));
   wc.lpszMenuName = NULL;
 
   if (!::RegisterClassEx(&wc))
     return false;
 
   // Leaving this window onscreen leads to a redraw error which makes it
   // a hassle to debug tests in an IDE, so we place the window somewhere that
   // won't happen.
   HWND hwnd = ::CreateWindowExW(
       NULL,
       wc.lpszClassName,
       L"",
       WS_OVERLAPPEDWINDOW,
       10,
       0,
       512,
       512,
       0,
       0,
-      instance,
+      g_instance,
       0);
 
   if (hwnd == NULL) {
     return false;
   }
 
   ::ShowWindow(hwnd, SW_SHOWNORMAL);
 
 
   return hwnd;
 #else
 #error Need code.
 #endif
 }
 
-int main(int argc, const char** argv) {
+#if defined(OS_WIN)
+int WINAPI WinMain(HINSTANCE instance,
+                   HINSTANCE prev_instance,
+                   LPSTR command_line,
+                   int command_show) {
+  g_instance = instance;
+#else
+int main(int argc, char** argv) {
+#endif
+
   const int32 kCommandBufferSize = 1024 * 1024;
 
   base::AtExitManager at_exit_manager;
   MessageLoopForUI message_loop;
 
   GLES2Demo* demo = new GLES2Demo();
 
   void* hwnd = SetupWindow();
   if (!hwnd) {
     ::fprintf(stdout, "Could not setup window.\n");
     return EXIT_FAILURE;
   }
 
   demo->Setup(hwnd, kCommandBufferSize);
 
   ProcessMessages(hwnd);
 
   return EXIT_SUCCESS;
 }