From a062b5a376f92d50f5053f7a1be4f829b9982110 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 23 Jul 2023 15:02:44 -0700
Subject: [PATCH] Fixed Mac OSX Bugs

---
 src/dawn/scene/debug/SceneDebugLine.cpp |  8 ++++----
 src/dawnglfw/host/DawnGLFWHost.cpp      | 11 ++++++-----
 src/dawnlinux64/host/DawnHostTux32.cpp  |  2 +-
 src/dawnopengl/display/Texture.cpp      |  5 ++---
 src/dawnosx/host/DawnHostOSX.cpp        |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/dawn/scene/debug/SceneDebugLine.cpp b/src/dawn/scene/debug/SceneDebugLine.cpp
index dca561fc..ec8ee432 100644
--- a/src/dawn/scene/debug/SceneDebugLine.cpp
+++ b/src/dawn/scene/debug/SceneDebugLine.cpp
@@ -21,10 +21,10 @@ struct ShaderPassItem SceneDebugLine::createShaderItem(
   Camera *camera,
   SimpleTexturedShader *shader
 ) {
-  assertNotNull(mesh);
-  assertNotNull(lineIndex);
-  assertNotNull(camera);
-  assertNotNull(shader);
+  assertNotNull(mesh, "SceneDebugLine::createShaderItem: Mesh cannot be null");
+  assertNotNull(lineIndex, "SceneDebugLine::createShaderItem: Line Index cannot be null");
+  assertNotNull(camera, "SceneDebugLine::createShaderItem: Camera cannot be null");
+  assertNotNull(shader, "SceneDebugLine::createShaderItem: Shader cannot be null");
 
   struct ShaderPassItem item;
   item.shader = shader;
diff --git a/src/dawnglfw/host/DawnGLFWHost.cpp b/src/dawnglfw/host/DawnGLFWHost.cpp
index 7cdd517f..6fee6c08 100644
--- a/src/dawnglfw/host/DawnGLFWHost.cpp
+++ b/src/dawnglfw/host/DawnGLFWHost.cpp
@@ -31,7 +31,7 @@ int32_t DawnHost::init(DawnGame *game) {
 
   glfwSetErrorCallback(&glfwOnError);
   
-  // Setup window hints 
+  // Setup window hints
   glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, false);
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
@@ -56,10 +56,11 @@ int32_t DawnHost::init(DawnGame *game) {
   assertNoGLError();
 
   // Override the defaults
-  game->renderManager.backBuffer.setSize(
-    DAWN_GLFW_WINDOW_WIDTH_DEFAULT,
-    DAWN_GLFW_WINDOW_HEIGHT_DEFAULT
-  );
+  int32_t fbWidth, fbHeight;
+  glfwGetFramebufferSize(this->data->window, &fbWidth, &fbHeight);
+  assertTrue(fbWidth > 0, "Detected framebuffer width is too small?");
+  assertTrue(fbWidth > 0, "Detected framebuffer height is too small?");
+  game->renderManager.backBuffer.setSize(fbWidth, fbHeight);
   assertNoGLError();
 
   // Default keybinds
diff --git a/src/dawnlinux64/host/DawnHostTux32.cpp b/src/dawnlinux64/host/DawnHostTux32.cpp
index 21bf915e..cd5a4fd2 100644
--- a/src/dawnlinux64/host/DawnHostTux32.cpp
+++ b/src/dawnlinux64/host/DawnHostTux32.cpp
@@ -49,7 +49,7 @@ int32_t main(int32_t argc, char **args) {
   delete host;
 
   #if DAWN_DEBUG_BUILD
-    assertTrue(dawnAllocatedItemCount == 0);
+    assertTrue(dawnAllocatedItemCount == 0, "DawnHostTux32: Failed to free all allocated items.");
   #endif
 
   // Success
diff --git a/src/dawnopengl/display/Texture.cpp b/src/dawnopengl/display/Texture.cpp
index e7ae0ecb..fc9cb0ad 100644
--- a/src/dawnopengl/display/Texture.cpp
+++ b/src/dawnopengl/display/Texture.cpp
@@ -53,9 +53,8 @@ void Texture::setSize(
   #if DAWN_DEBUG_BUILD
     int32_t maxSize;
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
-
-    assertTrue(width > 0 && width <= maxSize);
-    assertTrue(height > 0 && height <= maxSize);
+    assertTrue(width > 0 && width <= maxSize, "Texture::setSize: Width is out of bounds!");
+    assertTrue(height > 0 && height <= maxSize, "Texture::setSize: Height is out of bounds!");
   #endif
 
   this->width = width;
diff --git a/src/dawnosx/host/DawnHostOSX.cpp b/src/dawnosx/host/DawnHostOSX.cpp
index 8df21fc5..6f31911e 100644
--- a/src/dawnosx/host/DawnHostOSX.cpp
+++ b/src/dawnosx/host/DawnHostOSX.cpp
@@ -49,7 +49,7 @@ int32_t main(int32_t argc, char **args) {
   delete host;
 
   #if DAWN_DEBUG_BUILD
-    assertTrue(dawnAllocatedItemCount == 0);
+    assertTrue(dawnAllocatedItemCount == 0, "DawnHostOSX: Failed to free all allocated items.");
   #endif
 
   // Success