tmp

.vscode/launch.json

@@ -23,6 +23,17 @@
         }
       ]
       "preLaunchTask": "Build project",
+    },
+    {
+      "name": "C/C++: cl.exe build and debug active file",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}\\out\\debug\\demo.exe",
+      "args": [],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}\\out\\debug",
+      "environment": [],
+      "externalConsole": false,
     }
-  ]
+ ]
 }

build/BUILD.gn

@@ -173,7 +173,9 @@ config("warnings") {
       # Disable the following warnings:
       "/wd4061",  # enumerator in switch with a default case not explicitly
                   # handled by a case label.
-      "/wd4100",  # unreferenced format parameter.
+      "/wd4100",  # nonstandard extension used: nameless struct/union.
+      "/wd4201",  # enumerator in switch with a default case not explicitly
+                  # handled by a case label.
       "/wd4324",  # structure was padded due to alignment specifier
       "/wd4371",  # layout of class may have changed from a previous version of
                   # the compiler due to better packing of member
@@ -185,6 +187,10 @@ config("warnings") {
                   # switch specified.
 
       # TODO: Not sure how I feel about these conversion warnings.
+      "/Wv:18",   # tmp
+      "/wd4191",  # tmp:'type cast': unsafe conversion
+      "/wd4242",  # tmp:conversion from 'int' to 'uint8_t'
+      "/wd4245",  # tmp:conversion from 'int' to 'const unsigned int'
       "/wd4244",  # conversion, possible loss of data. 'int' to 'float'
       "/wd4267",  # conversion, possible loss of data.
       "/wd4305",  # truncation from 'double' to 'float'.
@@ -232,6 +238,7 @@ config("warnings") {
     defines = [
       "_CRT_NONSTDC_NO_DEPRECATE",
       "_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING",
+      "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS",
     ]
   } else if (is_mac) {
     cflags = [

build/android/app/CMakeLists.txt

@@ -49,6 +49,7 @@ project(kaliber)
 add_library(kaliber SHARED
     ../../../src/base/collusion_test.cc
     ../../../src/base/log.cc
+    ../../../src/base/mem.cc
     ../../../src/base/task_runner.cc
     ../../../src/base/thread_pool.cc
     ../../../src/demo/credits.cc
@@ -136,7 +137,6 @@ add_library(kaliber SHARED
     ../../../src/third_party/minizip/ioapi.c
     ../../../src/third_party/minizip/unzip.c
     ../../../src/third_party/spirv-reflect/spirv_reflect.c
-    ../../../src/third_party/stb/stb_image.c
     ../../../src/third_party/texture_compressor/dxt_encoder_internals.cc
     ../../../src/third_party/texture_compressor/dxt_encoder.cc
     ../../../src/third_party/texture_compressor/texture_compressor_etc1.cc

src/base/BUILD.gn

@@ -8,6 +8,7 @@ source_set("base") {
     "interpolation.h",
     "log.cc",
     "log.h",
+    "mem.cc",
     "mem.h",
     "misc.h",
     "random.h",

src/base/mem.cc

@@ -0,0 +1,46 @@
+#include "base/mem.h"
+
+#include <cstring>
+
+#if defined(__ANDROID__)
+#include <malloc.h>
+#endif
+
+namespace base {
+
+void* AlignedAlloc(size_t size, size_t alignment) {
+  DCHECK(size > 0U);
+  DCHECK(IsPow2(alignment));
+  DCHECK((alignment % sizeof(void*)) == 0U);
+
+  void* ptr = nullptr;
+#if defined(_WIN32)
+  ptr = _aligned_malloc(size, alignment);
+#elif defined(__ANDROID__)
+  ptr = memalign(alignment, size);
+#else
+  int ret = posix_memalign(&ptr, alignment, size);
+  if (ret != 0) {
+    DLOG(0) << "posix_memalign() returned with error " << ret;
+    ptr = nullptr;
+  }
+#endif
+
+  // Aligned allocations may fail for non-memory related reasons.
+  CHECK(ptr) << "Aligned allocation failed. "
+             << "size=" << size << ", alignment=" << alignment;
+  DCHECK(IsAligned(ptr, alignment));
+  return ptr;
+}
+
+void* AlignedRealloc(void* ptr,
+                     size_t old_size,
+                     size_t new_size,
+                     size_t alignment) {
+  auto* new_ptr = AlignedAlloc(new_size, alignment);
+  memmove(new_ptr, ptr, old_size);
+  AlignedFree(ptr);
+  return new_ptr;
+}
+
+}  // namespace base

src/base/mem.h

@@ -1,26 +1,33 @@
 #ifndef BASE_MEM_H
 #define BASE_MEM_H
 
-#include <cstdlib>
+#include <stddef.h>
+#include <stdint.h>
 #include <memory>
 
-#if defined(__ANDROID__)
+#if defined(_WIN32)
 #include <malloc.h>
+#else
+#include <stdlib.h>
 #endif
 
 #include "base/log.h"
-
-#define ALIGN_MEM(alignment) __attribute__((aligned(alignment)))
+#include "base/misc.h"
 
 namespace base {
 
+inline void AlignedFree(void* mem) {
+#if defined(_WIN32)
+  _aligned_free(mem);
+#else
+  free(mem);
+#endif
+}
+
 namespace internal {
 
 struct ScopedAlignedFree {
-  inline void operator()(void* x) const {
-    if (x)
-      free(x);
-  }
+  inline void operator()(void* x) const { AlignedFree(x); }
 };
 
 }  // namespace internal
@@ -28,27 +35,16 @@ struct ScopedAlignedFree {
 template <typename T>
 using AlignedMemPtr = std::unique_ptr<T, internal::ScopedAlignedFree>;
 
-template <int kAlignment>
-inline void* AlignedAlloc(size_t size) {
-  void* ptr = NULL;
-#if defined(__ANDROID__)
-  ptr = memalign(kAlignment, size);
-#else
-  if (posix_memalign(&ptr, kAlignment, size))
-    ptr = NULL;
-#endif
-  DCHECK(ptr);
-  // DCHECK(((unsigned)ptr & (kAlignment - 1)) == 0);
-  return ptr;
-}
+void* AlignedAlloc(size_t size, size_t alignment);
 
-inline void AlignedFree(void* mem) {
-  free(mem);
-}
+void* AlignedRealloc(void* ptr,
+                     size_t old_size,
+                     size_t new_size,
+                     size_t alignment);
 
-template <int kAlignment>
-inline bool IsAligned(void* ptr) {
-  return (reinterpret_cast<uintptr_t>(ptr) & (kAlignment - 1)) == 0U;
+inline bool IsAligned(const void* val, size_t alignment) {
+  DCHECK(IsPow2(alignment)) << alignment << " is not a power of 2";
+  return (reinterpret_cast<uintptr_t>(val) & (alignment - 1)) == 0;
 }
 
 }  // namespace base

src/base/vecmath.h

@@ -1247,8 +1247,8 @@ class Matrix4 {
                            T fov_aspect,
                            T width,
                            T height,
-                           T near,
-                           T far) {
+                           T near_,
+                           T far_) {
     // Calc x and y scale from FOV.
     T scale =
         T(2.0) /
@@ -1257,8 +1257,8 @@ class Matrix4 {
     T x_scale = y_scale / (width / height);
     _M_SET_ROW(0, x_scale / T(2.0), 0, 0, 0);
     _M_SET_ROW(1, 0, (-y_scale) / T(2.0), 0, 0);
-    _M_SET_ROW(2, 0, 0, far / (far - near), 1);
-    _M_SET_ROW(3, 0, 0, -near * far / (far - near), 0);
+    _M_SET_ROW(2, 0, 0, far_ / (far_ - near_), 1);
+    _M_SET_ROW(3, 0, 0, -near_ * far_ / (far_ - near_), 0);
   }
 
   void CreateTranslation(const Vector3<T>& t) {

src/demo/BUILD.gn

@@ -18,7 +18,7 @@ executable("demo") {
   ]
 
   deps = [
-    "//assets",
+    # "//assets",
     "//src/base",
     "//src/engine",
   ]

src/demo/player.cc

@@ -2,6 +2,7 @@
 
 #include "base/interpolation.h"
 #include "base/log.h"
+#include "base/vecmath.h"
 #include "engine/asset/font.h"
 #include "engine/engine.h"
 #include "engine/input_event.h"

src/engine/BUILD.gn

@@ -80,6 +80,23 @@ source_set("engine") {
     ]
   }
 
+  if (target_os == "win") {
+    sources += [
+      "audio/audio_sink_null.h",
+      "platform/asset_file_linux.cc",
+      "platform/platform_win.cc",
+      "renderer/opengl/renderer_opengl_win.cc",
+      "renderer/vulkan/renderer_vulkan_win.cc",
+      "renderer/vulkan/vulkan_context_win.cc",
+    ]
+
+    libs = [
+      # "gdi32.lib",  # Graphics
+      "user32.lib",  # Win32 API core functionality.
+      # "shell32.lib",  # Drag and Drop
+    ]
+  }
+
   deps = [
     "//assets/engine",
     "//src/base",

src/engine/asset/image.cc

@@ -5,13 +5,19 @@
 
 #include "base/interpolation.h"
 #include "base/log.h"
+#include "base/mem.h"
 #include "base/misc.h"
 #include "engine/engine.h"
 #include "engine/platform/asset_file.h"
 #include "third_party/texture_compressor/texture_compressor.h"
 
-// This 3rd party library is written in C and uses malloc, which means that we
-// have to do the same.
+// Use aligned memory for SIMD in texture compressor.
+#define STB_IMAGE_IMPLEMENTATION
+#define STBI_NO_STDIO
+#define STBI_MALLOC(sz) base::AlignedAlloc(sz, 16)
+#define STBI_REALLOC_SIZED(p, oldsz, newsz) \
+  base::AlignedRealloc(p, oldsz, newsz, 16)
+#define STBI_FREE(p) base::AlignedFree(p)
 #include "third_party/stb/stb_image.h"
 
 using namespace base;
@@ -77,7 +83,7 @@ bool Image::Create(int w, int h) {
   width_ = w;
   height_ = h;
 
-  buffer_.reset((uint8_t*)AlignedAlloc<16>(w * h * 4 * sizeof(uint8_t)));
+  buffer_.reset((uint8_t*)AlignedAlloc(w * h * 4 * sizeof(uint8_t), 16));
 
   return true;
 }
@@ -85,7 +91,7 @@ bool Image::Create(int w, int h) {
 void Image::Copy(const Image& other) {
   if (other.buffer_) {
     int size = other.GetSize();
-    buffer_.reset((uint8_t*)AlignedAlloc<16>(size));
+    buffer_.reset((uint8_t*)AlignedAlloc(size, 16));
     memcpy(buffer_.get(), other.buffer_.get(), size);
   }
   width_ = other.width_;
@@ -101,7 +107,7 @@ bool Image::CreateMip(const Image& other) {
   width_ = std::max(other.width_ >> 1, 1);
   height_ = std::max(other.height_ >> 1, 1);
   format_ = kRGBA32;
-  buffer_.reset((uint8_t*)AlignedAlloc<16>(GetSize()));
+  buffer_.reset((uint8_t*)AlignedAlloc(GetSize(), 16));
 
   // If the width isn't perfectly divisable with two, then we end up skewing
   // the image because the source offset isn't updated properly.
@@ -158,7 +164,7 @@ bool Image::Load(const std::string& file_name) {
       // LOG(0)("Converting image from 1 to 4 channels.\n");
       // Assume it's an intensity, duplicate it to RGB and fill A with opaque.
       converted_buffer =
-          (uint8_t*)AlignedAlloc<16>(w * h * 4 * sizeof(uint8_t));
+          (uint8_t*)AlignedAlloc(w * h * 4 * sizeof(uint8_t), 16);
       for (int i = 0; i < w * h; ++i) {
         converted_buffer[i * 4 + 0] = buffer_[i];
         converted_buffer[i * 4 + 1] = buffer_[i];
@@ -171,7 +177,7 @@ bool Image::Load(const std::string& file_name) {
       // LOG(0)("Converting image from 3 to 4 channels.\n");
       // Add an opaque channel.
       converted_buffer =
-          (uint8_t*)AlignedAlloc<16>(w * h * 4 * sizeof(uint8_t));
+          (uint8_t*)AlignedAlloc(w * h * 4 * sizeof(uint8_t), 16);
       for (int i = 0; i < w * h; ++i) {
         converted_buffer[i * 4 + 0] = buffer_[i * 3 + 0];
         converted_buffer[i * 4 + 1] = buffer_[i * 3 + 1];
@@ -238,7 +244,7 @@ void Image::ConvertToPow2() {
            << new_width << ", " << new_height << ")";
 
     int bigger_size = new_width * new_height * 4 * sizeof(uint8_t);
-    uint8_t* bigger_buffer = (uint8_t*)AlignedAlloc<16>(bigger_size);
+    uint8_t* bigger_buffer = (uint8_t*)AlignedAlloc(bigger_size, 16);
 
     // Fill it with black.
     memset(bigger_buffer, 0, bigger_size);
@@ -296,7 +302,7 @@ bool Image::Compress() {
 
   unsigned compressedSize = GetSize();
   uint8_t* compressedBuffer =
-      (uint8_t*)AlignedAlloc<16>(compressedSize * sizeof(uint8_t));
+      (uint8_t*)AlignedAlloc(compressedSize * sizeof(uint8_t), 16);
 
   const uint8_t* src = buffer_.get();
   uint8_t* dst = compressedBuffer;

src/engine/audio/audio_mixer.cc

@@ -11,6 +11,8 @@
 #include "engine/audio/audio_sink_oboe.h"
 #elif defined(__linux__)
 #include "engine/audio/audio_sink_alsa.h"
+#elif defined(_WIN32)
+#include "engine/audio/audio_sink_null.h"
 #endif
 
 using namespace base;
@@ -23,6 +25,8 @@ AudioMixer::AudioMixer()
       audio_sink_{std::make_unique<AudioSinkOboe>(this)} {
 #elif defined(__linux__)
       audio_sink_{std::make_unique<AudioSinkAlsa>(this)} {
+#elif defined(_WIN32)
+      audio_sink_{std::make_unique<AudioSinkNull>()} {
 #endif
   bool res = audio_sink_->Initialize();
   CHECK(res) << "Failed to initialize audio sink.";

src/engine/audio/audio_sink_null.h

@@ -0,0 +1,23 @@
+#ifndef ENGINE_AUDIO_AUDIO_SINK_NULL_H
+#define ENGINE_AUDIO_AUDIO_SINK_NULL_H
+
+#include "engine/audio/audio_sink.h"
+
+namespace eng {
+
+class AudioSinkNull final : public AudioSink {
+ public:
+  AudioSinkNull() = default;
+  ~AudioSinkNull() final = default;
+
+  bool Initialize() final { return true; }
+
+  void Suspend() final {}
+  void Resume() final {}
+
+  size_t GetHardwareSampleRate() final { return 0; }
+};
+
+}  // namespace eng
+
+#endif  // ENGINE_AUDIO_AUDIO_SINK_NULL_H

src/engine/audio/sinc_resampler.cc

@@ -192,13 +192,13 @@ SincResampler::SincResampler(double io_sample_rate_ratio, int request_frames)
       input_buffer_size_(request_frames_ + kernel_size_),
       // Create input buffers with a 32-byte alignment for SIMD optimizations.
       kernel_storage_(static_cast<float*>(
-          base::AlignedAlloc<32>(sizeof(float) * kernel_storage_size_))),
+          base::AlignedAlloc(sizeof(float) * kernel_storage_size_, 32))),
       kernel_pre_sinc_storage_(static_cast<float*>(
-          base::AlignedAlloc<32>(sizeof(float) * kernel_storage_size_))),
+          base::AlignedAlloc(sizeof(float) * kernel_storage_size_, 32))),
       kernel_window_storage_(static_cast<float*>(
-          base::AlignedAlloc<32>(sizeof(float) * kernel_storage_size_))),
+          base::AlignedAlloc(sizeof(float) * kernel_storage_size_, 32))),
       input_buffer_(static_cast<float*>(
-          base::AlignedAlloc<32>(sizeof(float) * input_buffer_size_))),
+          base::AlignedAlloc(sizeof(float) * input_buffer_size_, 32))),
       r1_(input_buffer_.get()),
       r2_(input_buffer_.get() + kernel_size_ / 2) {
   CHECK(request_frames > kernel_size_ * 3 / 2)

src/engine/platform/asset_file.h

@@ -7,7 +7,7 @@
 #if defined(__ANDROID__)
 #include <zlib.h>
 #include "third_party/minizip/unzip.h"
-#elif defined(__linux__)
+#else
 #include "base/file.h"
 #endif
 
@@ -34,7 +34,7 @@ class AssetFile {
 #if defined(__ANDROID__)
   unzFile archive_ = 0;
   size_t uncompressed_size_ = 0;
-#elif defined(__linux)
+#else
   base::ScopedFILE file_;
 #endif
 };

src/engine/platform/platform.h

@@ -16,6 +16,13 @@ struct ANativeWindow;
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#elif defined(_WIN32)
+
+// #include <WinSDKVer.h>
+// #define _WIN32_WINNT 0x0601
+// #include <SDKDDKVer.h>
+#include <windows.h>
+
 #endif
 
 namespace eng {
@@ -28,6 +35,8 @@ class Platform {
   Platform(android_app* app);
 #elif defined(__linux__)
   Platform();
+#elif defined(_WIN32)
+  Platform(HINSTANCE hInstance, int nCmdShow);
 #endif
   ~Platform();
 
@@ -62,6 +71,9 @@ class Platform {
 #elif defined(__linux__)
   Display* GetDisplay();
   Window GetWindow();
+#elif defined(_WIN32)
+  HINSTANCE GetInstance();
+  HWND GetWindow();
 #endif
 
  private:
@@ -111,6 +123,15 @@ class Platform {
 
   XVisualInfo* GetXVisualInfo(Display* display);
 
+#elif defined(_WIN32)
+
+  // Global Variables:
+  HINSTANCE hInst;           // current instance
+  HWND hWnd;
+
+  // Forward declarations of functions included in this code module:
+  static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
+
 #endif
 
   Platform(const Platform&) = delete;

src/engine/platform/platform_win.cc

@@ -0,0 +1,131 @@
+#include "engine/platform/platform.h"
+
+// #include <limits.h>
+// #include <stdio.h>
+// #include <cstring>
+// #include <memory>
+//
+#include "base/log.h"
+// #include "base/vecmath.h"
+// #include "engine/input_event.h"
+// #include "engine/platform/platform_observer.h"
+
+using namespace base;
+
+namespace eng {
+
+void KaliberMain(Platform* platform);
+
+Platform::Platform(HINSTANCE hInstance, int nCmdShow) : hInst(hInstance) {
+  LOG(0) << "Initializing platform.";
+
+  root_path_ = "./";
+  data_path_ = "./";
+  shared_data_path_ = "./";
+
+  LOG(0) << "Root path: " << root_path_.c_str();
+  LOG(0) << "Data path: " << data_path_.c_str();
+  LOG(0) << "Shared data path: " << shared_data_path_.c_str();
+
+  WNDCLASSEXW wcex;
+  wcex.cbSize = sizeof(WNDCLASSEX);
+  wcex.style = CS_HREDRAW | CS_VREDRAW;
+  wcex.lpfnWndProc = WndProc;
+  wcex.cbClsExtra = 0;
+  wcex.cbWndExtra = 0;
+  wcex.hInstance = hInstance;
+  wcex.hIcon =
+      nullptr;  // LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WINDOWSPROJECT1));
+  wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
+  wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+  wcex.lpszMenuName = nullptr;  // MAKEINTRESOURCEW(IDC_WINDOWSPROJECT1);
+  wcex.lpszClassName = L"szWindowClass";
+  wcex.hIconSm =
+      nullptr;  // LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
+  RegisterClassExW(&wcex);
+
+  hWnd = CreateWindowW(L"szWindowClass", L"kaliber", WS_OVERLAPPEDWINDOW,
+                       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr,
+                       hInstance, nullptr);
+  CHECK(hWnd);
+
+  ShowWindow(hWnd, nCmdShow);
+  UpdateWindow(hWnd);
+}
+
+Platform::~Platform() {
+  LOG(0) << "Shutting down platform.";
+}
+
+void Platform::Update() {}
+
+void Platform::Exit() {
+  should_exit_ = true;
+}
+
+void Platform::Vibrate(int duration) {}
+
+void Platform::ShowInterstitialAd() {}
+
+void Platform::ShareFile(const std::string& file_name) {}
+
+void Platform::SetKeepScreenOn(bool keep_screen_on) {}
+
+HINSTANCE Platform::GetInstance() {
+  return hInst;
+}
+
+HWND Platform::GetWindow() {
+  return hWnd;
+}
+
+LRESULT CALLBACK Platform::WndProc(HWND hWnd,
+                                   UINT message,
+                                   WPARAM wParam,
+                                   LPARAM lParam) {
+  // switch (message)
+  // {
+  // case WM_COMMAND:
+  //     {
+  //         int wmId = LOWORD(wParam);
+  //         // Parse the menu selections:
+  //         switch (wmId)
+  //         {
+  //         case IDM_ABOUT:
+  //             DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
+  //             break;
+  //         case IDM_EXIT:
+  //             DestroyWindow(hWnd);
+  //             break;
+  //         default:
+  //             return DefWindowProc(hWnd, message, wParam, lParam);
+  //         }
+  //     }
+  //     break;
+  // case WM_PAINT:
+  //     {
+  //         PAINTSTRUCT ps;
+  //         HDC hdc = BeginPaint(hWnd, &ps);
+  //         // TODO: Add any drawing code that uses hdc here...
+  //         EndPaint(hWnd, &ps);
+  //     }
+  //     break;
+  // case WM_DESTROY:
+  //     PostQuitMessage(0);
+  //     break;
+  // default:
+      return DefWindowProc(hWnd, message, wParam, lParam);
+  // }
+  // return 0;
+}
+
+}  // namespace eng
+
+int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
+                      _In_opt_ HINSTANCE hPrevInstance,
+                      _In_ LPWSTR lpCmdLine,
+                      _In_ int nCmdShow) {
+  eng::Platform platform(hInstance, nCmdShow);
+  eng::KaliberMain(&platform);
+  return 0;
+}

src/engine/renderer/opengl/opengl.h

@@ -17,6 +17,16 @@
 #define GL_ETC1_RGB8_OES 0x8D64
 #endif
 
+#elif defined(_WIN32)
+#define GLEW_STATIC
+#include "third_party/glew/glew.h"
+#include "third_party/glew/wglew.h"
+
+// Define the missing format for the etc1
+#ifndef GL_ETC1_RGB8_OES
+#define GL_ETC1_RGB8_OES 0x8D64
+#endif
+
 #endif
 
 #endif  // ENGINE_RENDERER_OPENGL_OPENGL_H

src/engine/renderer/opengl/renderer_opengl_win.cc

@@ -0,0 +1,27 @@
+#include "engine/renderer/opengl/renderer_opengl.h"
+
+#include "base/log.h"
+#include "engine/platform/platform.h"
+
+namespace eng {
+
+bool RendererOpenGL::Initialize(Platform* platform) {
+  LOG(0) << "Initializing renderer.";
+
+  return InitCommon();
+}
+
+void RendererOpenGL::OnDestroy() {}
+
+void RendererOpenGL::Shutdown() {
+  LOG(0) << "Shutting down renderer.";
+  is_initialized_ = false;
+}
+
+void RendererOpenGL::Present() {
+  active_shader_id_ = 0;
+  active_texture_id_ = 0;
+  fps_++;
+}
+
+}  // namespace eng

src/engine/renderer/vulkan/renderer_vulkan_win.cc

@@ -0,0 +1,29 @@
+#include "engine/renderer/vulkan/renderer_vulkan.h"
+
+#include "base/log.h"
+#include "engine/platform/platform.h"
+
+namespace eng {
+
+bool RendererVulkan::Initialize(Platform* platform) {
+  LOG(0) << "Initializing renderer.";
+
+  // XWindowAttributes xwa;
+  // XGetWindowAttributes(platform->GetInstance(), platform->GetWindow(), &xwa);
+  RECT rect;
+  GetClientRect(platform->GetWindow(), &rect);
+
+  if (!context_.Initialize()) {
+    LOG(0) << "Failed to initialize Vulkan context.";
+    return false;
+  }
+  if (!context_.CreateSurface(platform->GetInstance(), platform->GetWindow(),
+                              rect.right, rect.bottom)) {
+    LOG(0) << "Vulkan context failed to create window.";
+    return false;
+  }
+
+  return InitializeInternal();
+}
+
+}  // namespace eng

src/engine/renderer/vulkan/vulkan_context.cc

@@ -703,7 +703,7 @@ bool VulkanContext::InitializeQueues(VkSurfaceKHR surface) {
 
 #if defined(__ANDROID__)
   VkFormat desired_format = VK_FORMAT_R8G8B8A8_UNORM;
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(_WIN32)
   VkFormat desired_format = VK_FORMAT_B8G8R8A8_UNORM;
 #endif
 

src/engine/renderer/vulkan/vulkan_context.h

@@ -11,6 +11,10 @@
 struct ANativeWindow;
 #endif
 
+// #if defined(_WIN32)
+// #include <windows.h>
+// #endif
+
 namespace eng {
 
 // Adapted from godot engin.
@@ -27,6 +31,8 @@ class VulkanContext {
   bool CreateWindow(ANativeWindow* window, int width, int height);
 #elif defined(__linux__)
   bool CreateWindow(Display* display, ::Window window, int width, int height);
+#elif defined(_WIN32)
+  bool CreateSurface(HINSTANCE hInstance, HWND hWnd, int width, int height);
 #endif
 
   void ResizeWindow(int width, int height);

src/engine/renderer/vulkan/vulkan_context_win.cc

@@ -0,0 +1,47 @@
+#include "engine/renderer/vulkan/vulkan_context.h"
+
+// #if defined(_WIN32)
+// #include <windows.h>
+// #endif
+
+#include "base/log.h"
+
+namespace eng {
+
+const char* VulkanContext::GetPlatformSurfaceExtension() const {
+  return VK_KHR_WIN32_SURFACE_EXTENSION_NAME;
+}
+
+bool VulkanContext::CreateSurface(HINSTANCE hInstance,
+                                  HWND hWnd,
+                                  int width,
+                                  int height) {
+  VkWin32SurfaceCreateInfoKHR create_info;
+  create_info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
+  create_info.pNext = nullptr;
+  create_info.flags = 0;
+  create_info.hinstance = hInstance;
+  create_info.hwnd = hWnd;
+
+  VkSurfaceKHR surface;
+  VkResult err =
+      vkCreateWin32SurfaceKHR(instance_, &create_info, nullptr, &surface);
+  if (err != VK_SUCCESS) {
+    LOG(0) << "vkCreateWin32SurfaceKHR failed with error "
+           << std::to_string(err);
+    return false;
+  }
+
+  if (!queues_initialized_ && !InitializeQueues(surface))
+    return false;
+
+  window_.surface = surface;
+  window_.width = width;
+  window_.height = height;
+  if (!UpdateSwapChain(&window_))
+    return false;
+
+  return true;
+}
+
+}  // namespace eng

src/third_party/BUILD.gn

@@ -7,6 +7,10 @@ config("third_party_config") {
   if (target_os == "linux") {
     defines = [ "VK_USE_PLATFORM_XLIB_KHR" ]
   }
+
+  if (target_os == "win") {
+    defines = [ "VK_USE_PLATFORM_WIN32_KHR" ]
+  }
 }
 
 source_set("third_party") {
@@ -53,13 +57,13 @@ source_set("third_party") {
     "glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp",
     "glslang/glslang/MachineIndependent/propagateNoContraction.cpp",
     "glslang/glslang/MachineIndependent/reflection.cpp",
-    "glslang/glslang/OSDependent/Unix/ossource.cpp",
+    # "glslang/glslang/OSDependent/Unix/ossource.cpp",
+    "glslang/glslang/OSDependent/Windows/ossource.cpp",
     "jsoncpp/json.h",
     "jsoncpp/jsoncpp.cpp",
     "minimp3/minimp3.h",
     "minimp3/minimp3_ex.h",
     "spirv-reflect/spirv_reflect.c",
-    "stb/stb_image.c",
     "stb/stb_image.h",
     "stb/stb_truetype.h",
     "texture_compressor/dxt_encoder.cc",
@@ -85,6 +89,16 @@ source_set("third_party") {
     ]
   }
 
+  if (target_os == "win") {
+    sources += [
+      "glew/glew.c",
+      "glew/glew.h",
+      "glew/wglew.h",
+    ]
+
+    libs = [ "opengl32.lib" ]
+  }
+
   configs -= [ "//build:warnings" ]
 
   deps = []

src/third_party/glslang/glslang/MachineIndependent/Constant.cpp

@@ -213,8 +213,8 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
             case EbtInt64:
                 if (rightUnionArray[i] == 0ll)
                     newConstArray[i].setI64Const(0x7FFFFFFFFFFFFFFFll);
-                else if (rightUnionArray[i].getI64Const() == -1 && leftUnionArray[i].getI64Const() == (long long)-0x8000000000000000ll)
-                    newConstArray[i].setI64Const((long long)-0x8000000000000000ll);
+                else if (rightUnionArray[i].getI64Const() == -1 && leftUnionArray[i].getI64Const() == (long long)0x8000000000000000ll)
+                    newConstArray[i].setI64Const((long long)0x8000000000000000ll);
                 else
                     newConstArray[i].setI64Const(leftUnionArray[i].getI64Const() / rightUnionArray[i].getI64Const());
                 break;

src/third_party/stb/stb_image.c

@@ -1,3 +0,0 @@
-#define STB_IMAGE_IMPLEMENTATION
-#define STBI_NO_STDIO
-#include "stb_image.h"