From bcfb80072ce30587a97300acc953dafe87488e70 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 7 Dec 2016 07:02:26 +0100 Subject: [PATCH] (XDK) Remove this - would have to be reimplemented --- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- gfx/drivers/d3d.cpp | 61 -------------------------------------------- 3 files changed, 2 insertions(+), 63 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 82a00aa2dc..016e3b41d0 100644 --- a/gfx/drivers/d3d.cpp +++ b/gfx/drivers/d3d.cpp @@ -1226,67 +1226,6 @@ static void d3d_free(void *data) win32_destroy_window(); } -#ifdef _XBOX - -#ifdef _XBOX1 -#include - -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) -{ - LPDIRECT3DVERTEXBUFFER d3dv; - void *verts = NULL; - float fX = (float)(x); - float fY = (float)(y); - - if (!d3d) - return false; - - d3dv = (LPDIRECT3DVERTEXBUFFER)out_img->vertex_buf; - - if (!d3dv) - return false; - - /* Create the new vertices. */ - Vertex newVerts[] = - { - // x, y, z, color, u ,v - {fX, fY, 0.0f, 0, 0, 0}, - {fX + w, fY, 0.0f, 0, 1, 0}, - {fX + w, fY + h, 0.0f, 0, 1, 1}, - {fX, fY + h, 0.0f, 0, 0, 1} - }; - - /* Load the existing vertices */ - verts = d3d_vertex_buffer_lock(d3dv); - - if (!verts) - return false; - - /* Copy the new verts over the old verts */ - memcpy(verts, newVerts, sizeof(newVerts)); - d3d_vertex_buffer_unlock(d3dv); - - d3d_enable_blend_func(d3d->dev); - d3d_enable_alpha_blend_texture_func(d3d->dev); - - /* Draw the quad. */ - 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); - - if (force_fullscreen) - d3d_set_viewport(d3d, w, h, force_fullscreen, false); - d3d_draw_primitive(d3d->dev, D3DPT_QUADLIST, 0, 1); - - return true; -} -#endif - -#endif - #ifdef HAVE_OVERLAY static void d3d_overlay_tex_geom( void *data,