YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Mac OSX Bugs

Browse Source
This commit is contained in:
Dominic Masters
2023-07-23 15:02:44 -07:00
parent a94b16e23f
commit a062b5a376
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dawn/scene/debug/SceneDebugLine.cpp
View File

@ -21,10 +21,10 @@ struct ShaderPassItem SceneDebugLine::createShaderItem(
Camera *camera, Camera *camera,
SimpleTexturedShader *shader SimpleTexturedShader *shader
) { ) {
assertNotNull(mesh); assertNotNull(mesh, "SceneDebugLine::createShaderItem: Mesh cannot be null");
assertNotNull(lineIndex); assertNotNull(lineIndex, "SceneDebugLine::createShaderItem: Line Index cannot be null");
assertNotNull(camera); assertNotNull(camera, "SceneDebugLine::createShaderItem: Camera cannot be null");
assertNotNull(shader); assertNotNull(shader, "SceneDebugLine::createShaderItem: Shader cannot be null");
struct ShaderPassItem item; struct ShaderPassItem item;
item.shader = shader; item.shader = shader;

11
src/dawnglfw/host/DawnGLFWHost.cpp
View File

@ -31,7 +31,7 @@ int32_t DawnHost::init(DawnGame *game) {
glfwSetErrorCallback(&glfwOnError); glfwSetErrorCallback(&glfwOnError);
// Setup window hints // Setup window hints
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, false); glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, false);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
@ -56,10 +56,11 @@ int32_t DawnHost::init(DawnGame *game) {
assertNoGLError(); assertNoGLError();
// Override the defaults // Override the defaults
game->renderManager.backBuffer.setSize( int32_t fbWidth, fbHeight;
DAWN_GLFW_WINDOW_WIDTH_DEFAULT, glfwGetFramebufferSize(this->data->window, &fbWidth, &fbHeight);
DAWN_GLFW_WINDOW_HEIGHT_DEFAULT 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(); assertNoGLError();
// Default keybinds // Default keybinds

2
src/dawnlinux64/host/DawnHostTux32.cpp
View File

@ -49,7 +49,7 @@ int32_t main(int32_t argc, char **args) {
delete host; delete host;
#if DAWN_DEBUG_BUILD #if DAWN_DEBUG_BUILD
assertTrue(dawnAllocatedItemCount == 0); assertTrue(dawnAllocatedItemCount == 0, "DawnHostTux32: Failed to free all allocated items.");
#endif #endif
// Success // Success

5
src/dawnopengl/display/Texture.cpp
View File

@ -53,9 +53,8 @@ void Texture::setSize(
#if DAWN_DEBUG_BUILD #if DAWN_DEBUG_BUILD
int32_t maxSize; int32_t maxSize;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
assertTrue(width > 0 && width <= maxSize, "Texture::setSize: Width is out of bounds!");
assertTrue(width > 0 && width <= maxSize); assertTrue(height > 0 && height <= maxSize, "Texture::setSize: Height is out of bounds!");
assertTrue(height > 0 && height <= maxSize);
#endif #endif
this->width = width; this->width = width;

2
src/dawnosx/host/DawnHostOSX.cpp
View File

@ -49,7 +49,7 @@ int32_t main(int32_t argc, char **args) {
delete host; delete host;
#if DAWN_DEBUG_BUILD #if DAWN_DEBUG_BUILD
assertTrue(dawnAllocatedItemCount == 0); assertTrue(dawnAllocatedItemCount == 0, "DawnHostOSX: Failed to free all allocated items.");
#endif #endif
// Success // Success