Skip to content

Commit ef09784

Browse files
JhonnygJhonnyg
committed
pre-review fixes
1 parent fe80378 commit ef09784

File tree

9 files changed

+10
-232
lines changed

9 files changed

+10
-232
lines changed

‎engine/engine/src/engine.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,6 @@ namespace dmEngine
20402040
fact_error = dmResource::Get(engine->m_Factory, gamepads, (void**)&gamepad_maps_ddf);
20412041
if (fact_error != dmResource::RESULT_OK)
20422042
{
2043-
dmLogError("failed at input.gamepads: %d", fact_error);
20442043
return false;
20452044
}
20462045
dmInput::RegisterGamepads(engine->m_InputContext, gamepad_maps_ddf);
@@ -2051,23 +2050,20 @@ namespace dmEngine
20512050
fact_error = dmResource::Get(engine->m_Factory, game_input_binding, (void**)&engine->m_GameInputBinding);
20522051
if (fact_error != dmResource::RESULT_OK)
20532052
{
2054-
dmLogError("failed at /input/game.input_bindingc: %d", fact_error);
20552053
return false;
20562054
}
20572055

20582056
const char* render_path = dmConfigFile::GetString(config, "bootstrap.render", "/builtins/render/default.renderc");
20592057
fact_error = dmResource::Get(engine->m_Factory, render_path, (void**)&engine->m_RenderScriptPrototype);
20602058
if (fact_error != dmResource::RESULT_OK)
20612059
{
2062-
dmLogError("failed at /builtins/render/default.renderc: %d", fact_error);
20632060
return false;
20642061
}
20652062

20662063
const char* display_profiles_path = dmConfigFile::GetString(config, "display.display_profiles", "/builtins/render/default.display_profilesc");
20672064
fact_error = dmResource::Get(engine->m_Factory, display_profiles_path, (void**)&engine->m_DisplayProfiles);
20682065
if (fact_error != dmResource::RESULT_OK)
20692066
{
2070-
dmLogError("failed at /builtins/render/default.display_profilesc: %d", fact_error);
20712067
return false;
20722068
}
20732069

‎engine/engine/wscript

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def configure(conf):
8585
glfw_lib = "glfw3-vulkan"
8686
platform_lib = "platform_vulkan"
8787

88+
# JG: for now, we only support validation layers on macos for x86_64 archs. I'll fix this later when/if needed.
8889
if architecture == 'x86_64':
8990
conf.env.append_value('LINKFLAGS', ['-framework', 'Metal', '-framework', 'Foundation', '-framework', 'IOSurface'])
9091

‎engine/graphics/src/graphics_glfw_wrappers.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
1313
// specific language governing permissions and limitations under the License.
1414

15-
/*
1615
#include <glfw/glfw.h>
1716
#include <glfw/glfw_native.h>
1817
#include "graphics_native.h"
@@ -35,4 +34,3 @@ namespace dmGraphics
3534
Window GetNativeX11Window() { return glfwGetX11Window(); }
3635
GLXContext GetNativeX11GLXContext() { return glfwGetX11GLXContext(); }
3736
}
38-
*/

‎engine/graphics/src/test/wscript

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ def build(bld):
1111
use = 'TESTMAIN DDF DLIB SOCKET PROFILE_NULL PLATFORM_NULL graphics_null graphics_transcoder_null',
1212
target = name)
1313

14-
"""
1514
if not bld.env.PLATFORM in ('x86_64-linux','x86_64-ios'):
1615

1716
extra_libs = []
@@ -37,4 +36,3 @@ def build(bld):
3736
source = 'test_app_graphics.cpp',
3837
use = 'TESTMAIN APP DDF DLIB PROFILE GRAPHICS GRAPHICS_VULKAN graphics_transcoder_basisu'.split() + platform_lib + glfw_lib + extra_libs,
3938
target = 'test_app_graphics')
40-
"""

‎engine/graphics/src/vulkan/graphics_vulkan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ namespace dmGraphics
10831083

10841084
delete[] device_list;
10851085

1086-
// GLFW3 handles window size changes differenrly, so we need to cater for that.
1086+
// GLFW3 handles window size changes differently, so we need to cater for that.
10871087
#ifndef __MACH__
10881088
if (created_width != context->m_Width || created_height != context->m_Height)
10891089
{

‎engine/platform/src/platform_window_glfw.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ namespace dmPlatform
153153
return 0;
154154
}
155155

156-
PlatformResult OpenWindowOpenGL(Window* wnd, const WindowParams& params)
156+
static PlatformResult OpenWindowOpenGL(Window* wnd, const WindowParams& params)
157157
{
158158
if (params.m_HighDPI)
159159
{
@@ -232,7 +232,7 @@ namespace dmPlatform
232232
return PLATFORM_RESULT_OK;
233233
}
234234

235-
PlatformResult OpenWindowVulkan(Window* wnd, const WindowParams& params)
235+
static PlatformResult OpenWindowVulkan(Window* wnd, const WindowParams& params)
236236
{
237237
glfwOpenWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
238238
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, params.m_Samples);

‎engine/platform/src/platform_window_glfw3.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ namespace dmPlatform
124124

125125
HWindow NewWindow()
126126
{
127+
#ifdef __MACH__
127128
glfwInitHint(GLFW_COCOA_CHDIR_RESOURCES, GLFW_FALSE);
129+
#endif
130+
128131
if (glfwInit() == GL_FALSE)
129132
{
130133
dmLogError("Could not initialize glfw.");
@@ -152,7 +155,7 @@ namespace dmPlatform
152155
return 0;
153156
}
154157

155-
PlatformResult OpenWindowOpenGL(Window* wnd, const WindowParams& params)
158+
static PlatformResult OpenWindowOpenGL(Window* wnd, const WindowParams& params)
156159
{
157160
// TODO: This is the setup required for OSX, when we implement the other desktop
158161
// platforms we might want to do this according to platform.
@@ -183,7 +186,7 @@ namespace dmPlatform
183186
return PLATFORM_RESULT_OK;
184187
}
185188

186-
PlatformResult OpenWindowVulkan(Window* wnd, const WindowParams& params)
189+
static PlatformResult OpenWindowVulkan(Window* wnd, const WindowParams& params)
187190
{
188191
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
189192
glfwWindowHint(GLFW_SAMPLES, params.m_Samples);
@@ -205,8 +208,6 @@ namespace dmPlatform
205208
return PLATFORM_RESULT_WINDOW_ALREADY_OPENED;
206209
}
207210

208-
glfwWindowHint(GLFW_FOCUSED, GLFW_TRUE);
209-
210211
PlatformResult res = PLATFORM_RESULT_WINDOW_OPEN_ERROR;
211212

212213
switch(params.m_GraphicsApi)

‎share/ext/glfw/patch_3.3.9_backup

Lines changed: 0 additions & 216 deletions
This file was deleted.

‎share/extender/build_input.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ context:
44
"ResourceTypeGameObject", "ResourceTypeCollection", "ResourceTypeScript", "ResourceTypeLua", "ResourceTypeAnim", "ResourceTypeAnimationSet", "ResourceTypeGui", "ResourceTypeGuiScript",
55
"ResourceProviderFile", "ResourceProviderArchive", "ResourceProviderArchiveMutable", "ResourceProviderZip", "ResourceProviderHttp",
66
"ComponentTypeScript", "ComponentTypeAnim", "ComponentTypeGui", "ComponentTypeMesh", "ScriptBox2DExt"]
7-
allowedLibs: ["engine","engine_release","profile","profile_null","remotery","remotery_null","profilerext","profilerext_null","crashext","crashext_null","record","record_null","gameobject","ddf","resource","gamesys","graphics","graphics_null","graphics_transcoder_null","graphics_transcoder_basisu","basis_transcoder","physics_2d","physics_3d","physics_null", "platform", "platform_null", "BulletDynamics","BulletCollision","LinearMath","Box2D","render","script","luajit-5.1","extension","hid","hid_null","input","particle","rig","dlib","dmglfw","glfw3","glfw3-vulkan","gui","crashext","sound","sound_null","tremolo","vpx","liveupdate",
7+
allowedLibs: ["engine","engine_release","profile","profile_null","remotery","remotery_null","profilerext","profilerext_null","crashext","crashext_null","record","record_null","gameobject","ddf","resource","gamesys","graphics","graphics_null","graphics_transcoder_null","graphics_transcoder_basisu","basis_transcoder","physics_2d","physics_3d","physics_null", "platform", "platform_vulkan", "platform_null", "BulletDynamics","BulletCollision","LinearMath","Box2D","render","script","luajit-5.1","extension","hid","hid_null","input","particle","rig","dlib","dmglfw","glfw3","glfw3-vulkan","gui","crashext","sound","sound_null","tremolo","vpx","liveupdate",
88
"libengine.lib","libengine_release.lib","libprofile.lib","libprofile_null.lib","libremotery.lib","libremotery_null.lib","libprofilerext.lib","libprofilerext_null.lib","libcrashext","libcrashext_null","librecord.lib","librecord_null.lib","libgameobject.lib","libddf.lib","libresource.lib","libgamesys.lib","libgraphics.lib","libgraphics_null.lib","libgraphics_transcoder_null.lib","libgraphics_transcoder_basisu.lib","libbasis_transcoder.lib","libphysics_2d.lib","libphysics_3d.lib","libphysics_null.lib","libBulletDynamics.lib","libBulletCollision.lib","libplatform.lib","libplatform_null.lib","libLinearMath.lib","libBox2D.lib","librender.lib",
99
"libscript.lib","libluajit.lib-5.1","libextension.lib","libhid.lib","libhid_null.lib","libinput.lib","libparticle.lib","librig.lib","libdlib.lib","libdmglfw.lib","libgui.lib","libcrashext.lib","libsound.lib","libsound_null.lib","libtremolo.lib","libvpx.lib","libliveupdate.lib",
1010
"engine_service","engine_service_null","libengine_service.lib","libengine_service_null.lib",

0 commit comments

Comments
 (0)