More string conversion.

This commit is contained in:
Ben Vanik
2014-08-16 02:50:08 -07:00
parent a4dfc23abc
commit 66d2336e38
11 changed files with 94 additions and 121 deletions

View File

@@ -113,7 +113,7 @@ void D3D11GraphicsSystem::Initialize() {
// will take place.
assert_null(window_);
window_ = new D3D11Window(run_loop_, dxgi_factory_, device_);
if (window_->Initialize("Xenia D3D11", 1280, 720)) {
if (window_->Initialize(L"Xenia D3D11", 1280, 720)) {
XELOGE("Failed to create D3D11Window");
exit(1);
return;

View File

@@ -49,7 +49,8 @@ D3D11Window::~D3D11Window() {
XESAFERELEASE(dxgi_factory_);
}
int D3D11Window::Initialize(const char* title, uint32_t width, uint32_t height) {
int D3D11Window::Initialize(const std::wstring& title, uint32_t width,
uint32_t height) {
int result = Win32Window::Initialize(title, width, height);
if (result) {
return result;

View File

@@ -27,18 +27,19 @@ public:
D3D11Window(
xe_run_loop_ref run_loop,
IDXGIFactory1* dxgi_factory, ID3D11Device* device);
virtual ~D3D11Window();
~D3D11Window() override;
ID3D11Device* device() const { return device_; }
IDXGISwapChain* swap_chain() const { return swap_chain_; }
ID3D11DeviceContext* context() const { return context_; }
virtual int Initialize(const char* title, uint32_t width, uint32_t height);
int Initialize(const std::wstring& title, uint32_t width,
uint32_t height) override;
void Swap();
protected:
virtual bool OnResize(uint32_t width, uint32_t height);
bool OnResize(uint32_t width, uint32_t height) override;
private:
IDXGIFactory1* dxgi_factory_;