From e0c3626791c5c5c3f7d0eef2b49db46ce443d026 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 7 Dec 2016 06:32:05 +0100 Subject: [PATCH] Turn this into _XBOX360 ifdef --- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- gfx/drivers/d3d.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index 5c24d99ff2..cc207e32c8 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418 +Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 diff --git a/deps/glslang/glslang b/deps/glslang/glslang index a4a4d5e22c..2eb0986f10 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b +Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440 diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp index 3db69155ff..82a00aa2dc 100644 --- a/gfx/drivers/d3d.cpp +++ b/gfx/drivers/d3d.cpp @@ -489,7 +489,7 @@ void d3d_make_d3dpp(void *data, { d3d_video_t *d3d = (d3d_video_t*)data; settings_t *settings = config_get_ptr(); -#ifdef _XBOX +#ifdef _XBOX360 /* TODO/FIXME - get rid of global state dependencies. */ global_t *global = global_get_ptr(); #endif