diff --git a/include/bgfx/embedded_shader.h b/include/bgfx/embedded_shader.h index 3b0196fb7..a377424d0 100644 --- a/include/bgfx/embedded_shader.h +++ b/include/bgfx/embedded_shader.h @@ -19,7 +19,6 @@ #define BGFX_PLATFORM_SUPPORTS_DX9BC (0 \ || BX_PLATFORM_WINDOWS \ - || BX_PLATFORM_XBOX360 \ ) #define BGFX_PLATFORM_SUPPORTS_DXBC (0 \ || BX_PLATFORM_WINDOWS \ diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 7bb765f87..3186c142b 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -177,9 +177,6 @@ namespace stl = std; # include #elif BX_PLATFORM_WINDOWS # include -#elif BX_PLATFORM_XBOX360 -# include -# include #endif // BX_PLATFORM_* #include diff --git a/src/config.h b/src/config.h index 8b94571ea..487a3c4fe 100644 --- a/src/config.h +++ b/src/config.h @@ -24,7 +24,6 @@ # ifndef BGFX_CONFIG_RENDERER_DIRECT3D9 # define BGFX_CONFIG_RENDERER_DIRECT3D9 (0 \ || BX_PLATFORM_WINDOWS \ - || BX_PLATFORM_XBOX360 \ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_DIRECT3D9 diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 148ff0eac..11459ef21 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -431,7 +431,7 @@ namespace bgfx { namespace d3d9 m_params.EnableAutoDepthStencil = TRUE; m_params.AutoDepthStencilFormat = D3DFMT_D24S8; m_params.Flags = D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL; -#if BX_PLATFORM_WINDOWS + m_params.FullScreen_RefreshRateInHz = 0; m_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; m_params.SwapEffect = D3DSWAPEFFECT_DISCARD; @@ -815,37 +815,6 @@ namespace bgfx { namespace d3d9 m_fmtDepth = D3DFMT_D24S8; -#elif BX_PLATFORM_XBOX360 - m_params.PresentationInterval = D3DPRESENT_INTERVAL_ONE; - m_params.DisableAutoBackBuffer = FALSE; - m_params.DisableAutoFrontBuffer = FALSE; - m_params.FrontBufferFormat = D3DFMT_X8R8G8B8; - m_params.FrontBufferColorSpace = D3DCOLORSPACE_RGB; - - m_d3d9 = Direct3DCreate9(D3D_SDK_VERSION); - BX_TRACE("Creating D3D9 %p", m_d3d9); - - XVIDEO_MODE videoMode; - XGetVideoMode(&videoMode); - if (!videoMode.fIsWideScreen) - { - m_params.Flags |= D3DPRESENTFLAG_NO_LETTERBOX; - } - - BX_TRACE("Creating device"); - DX_CHECK(m_d3d9->CreateDevice(m_adapter - , m_deviceType - , NULL - , D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_BUFFER_2_FRAMES - , &m_params - , &m_device - ) ); - - BX_TRACE("Device %p", m_device); - - m_fmtDepth = D3DFMT_D24FS8; -#endif // BX_PLATFORM_WINDOWS - { IDirect3DSwapChain9* swapChain; DX_CHECK(m_device->GetSwapChain(0, &swapChain) ); diff --git a/src/renderer_d3d9.h b/src/renderer_d3d9.h index 1a11ad615..4425c1b95 100644 --- a/src/renderer_d3d9.h +++ b/src/renderer_d3d9.h @@ -11,21 +11,6 @@ #if BX_PLATFORM_WINDOWS # include # include - -#elif BX_PLATFORM_XBOX360 -# include -# define D3DUSAGE_DYNAMIC 0 // not supported on X360 -# define D3DLOCK_DISCARD 0 // not supported on X360 -# define D3DERR_DEVICEHUNG D3DERR_DEVICELOST // not supported on X360 -# define D3DERR_DEVICEREMOVED D3DERR_DEVICELOST // not supported on X360 -# define D3DMULTISAMPLE_8_SAMPLES D3DMULTISAMPLE_4_SAMPLES -# define D3DMULTISAMPLE_16_SAMPLES D3DMULTISAMPLE_4_SAMPLES - -# define D3DFMT_DF24 D3DFMT_D24FS8 - -# define _PIX_SETMARKER(_col, _name) BX_NOOP() -# define _PIX_BEGINEVENT(_col, _name) BX_NOOP() -# define _PIX_ENDEVENT() BX_NOOP #endif // BX_PLATFORM_ #ifndef D3DSTREAMSOURCE_INDEXEDDATA diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index f2e335f2a..fa32caeca 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -958,7 +958,6 @@ namespace bgfx preprocessor.setDefaultDefine("BX_PLATFORM_OSX"); preprocessor.setDefaultDefine("BX_PLATFORM_PS4"); preprocessor.setDefaultDefine("BX_PLATFORM_WINDOWS"); - preprocessor.setDefaultDefine("BX_PLATFORM_XBOX360"); preprocessor.setDefaultDefine("BX_PLATFORM_XBOXONE"); // preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_ESSL"); @@ -1020,11 +1019,6 @@ namespace bgfx bx::snprintf(temp, sizeof(temp), "BGFX_SHADER_LANGUAGE_HLSL=%d", hlsl); preprocessor.setDefine(temp); } - else if (0 == bx::strCmpI(platform, "xbox360") ) - { - preprocessor.setDefine("BX_PLATFORM_XBOX360=1"); - preprocessor.setDefine("BGFX_SHADER_LANGUAGE_HLSL=3"); - } else if (0 == bx::strCmpI(platform, "orbis") ) { preprocessor.setDefine("BX_PLATFORM_PS4=1");