diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
index cc207e32c8..5c24d99ff2 160000
--- a/deps/SPIRV-Cross
+++ b/deps/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6
+Subproject commit 5c24d99ff22a25ef38e9e39985f80cf57a1e7418
diff --git a/deps/glslang/glslang b/deps/glslang/glslang
index 2eb0986f10..a4a4d5e22c 160000
--- a/deps/glslang/glslang
+++ b/deps/glslang/glslang
@@ -1 +1 @@
-Subproject commit 2eb0986f10392a4c2365869b17b59ad79226c440
+Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b
diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp
index 5c84ca78cd..3db69155ff 100644
--- a/gfx/drivers/d3d.cpp
+++ b/gfx/drivers/d3d.cpp
@@ -1167,7 +1167,6 @@ static void *d3d_init(const video_info_t *info,
    d3d->keep_aspect       = info->force_aspect;
 #ifdef _XBOX
    video_driver_set_own_driver();
-   video_input_ctl(RARCH_INPUT_CTL_SET_OWN_DRIVER, NULL);
 #endif
 
    return d3d;
@@ -1236,7 +1235,6 @@ static bool texture_image_render(d3d_video_t *d3d,
       struct texture_image *out_img,
       int x, int y, int w, int h, bool force_fullscreen)
 {
-   LPDIRECT3DTEXTURE d3dt;
    LPDIRECT3DVERTEXBUFFER d3dv;
    void *verts           = NULL;
    float fX              = (float)(x);
@@ -1245,10 +1243,9 @@ static bool texture_image_render(d3d_video_t *d3d,
    if (!d3d)
       return false;
 
-   d3dt = (LPDIRECT3DTEXTURE)out_img->texture_buf;
    d3dv = (LPDIRECT3DVERTEXBUFFER)out_img->vertex_buf;
 
-   if (!d3dt || !d3dv)
+   if (!d3dv)
       return false;
 
    /* Create the new vertices. */
@@ -1275,7 +1272,7 @@ static bool texture_image_render(d3d_video_t *d3d,
    d3d_enable_alpha_blend_texture_func(d3d->dev);
 
    /* Draw the quad. */
-   d3d_set_texture(d3d->dev, 0, d3dt);
+   d3d_set_texture(d3d->dev, 0, out_img->texture_buf);
    d3d_set_stream_source(d3d->dev, 0,
          d3dv, 0, sizeof(Vertex));
    d3d_set_vertex_shader(d3d->dev, D3DFVF_CUSTOMVERTEX, NULL);