AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Jack Andersen 2015-11-10 10:11:08 -10:00
parent df72fca65d
commit 6d3b8d3198
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boo/graphicsdev/wglew.h
View File

@ -71,6 +71,8 @@
# undef WIN32_LEAN_AND_MEAN # undef WIN32_LEAN_AND_MEAN
#endif #endif
#define GLEW_STATIC 1
/* /*
* GLEW_STATIC needs to be set when using the static version. * GLEW_STATIC needs to be set when using the static version.
* GLEW_BUILD is set when building the DLL version. * GLEW_BUILD is set when building the DLL version.

5
lib/win/ApplicationWin32.cpp
View File

@ -53,7 +53,7 @@ static bool FindBestD3DCompile()
namespace boo namespace boo
{ {
static LogVisor::LogModule Log("ApplicationWin32"); static LogVisor::LogModule Log("boo::ApplicationWin32");
IWindow* _WindowWin32New(const SystemString& title, Boo3DAppContext& d3dCtx); IWindow* _WindowWin32New(const SystemString& title, Boo3DAppContext& d3dCtx);
@ -167,6 +167,7 @@ public:
nullptr, __uuidof(ID3D12GraphicsCommandList), &m_3dCtx.m_ctx12.m_loadlist))) nullptr, __uuidof(ID3D12GraphicsCommandList), &m_3dCtx.m_ctx12.m_loadlist)))
Log.report(LogVisor::FatalError, "unable to create loader list"); Log.report(LogVisor::FatalError, "unable to create loader list");
Log.report(LogVisor::Info, "initialized D3D12 renderer");
return; return;
} }
#endif #endif
@ -201,6 +202,7 @@ public:
/* Build default sampler here */ /* Build default sampler here */
m_3dCtx.m_ctx11.m_dev->CreateSamplerState(&CD3D11_SAMPLER_DESC(D3D11_DEFAULT), &m_3dCtx.m_ctx11.m_ss); m_3dCtx.m_ctx11.m_dev->CreateSamplerState(&CD3D11_SAMPLER_DESC(D3D11_DEFAULT), &m_3dCtx.m_ctx11.m_ss);
Log.report(LogVisor::Info, "initialized D3D12 renderer");
return; return;
} }
@ -211,6 +213,7 @@ public:
if (FAILED(hr)) if (FAILED(hr))
Log.report(LogVisor::FatalError, "unable to create DXGI factory"); Log.report(LogVisor::FatalError, "unable to create DXGI factory");
Log.report(LogVisor::Info, "initialized OpenGL renderer");
return; return;
} }

3
lib/win/WindowWin32.cpp
View File

@ -6,6 +6,7 @@
#include "boo/graphicsdev/D3D.hpp" #include "boo/graphicsdev/D3D.hpp"
#include "boo/graphicsdev/GL.hpp" #include "boo/graphicsdev/GL.hpp"
#include "boo/graphicsdev/glew.h"
#include "boo/graphicsdev/wglew.h" #include "boo/graphicsdev/wglew.h"
static const int ContextAttribs[] = static const int ContextAttribs[] =
@ -20,7 +21,7 @@ static const int ContextAttribs[] =
namespace boo namespace boo
{ {
static LogVisor::LogModule Log("WindowWin32"); static LogVisor::LogModule Log("boo::WindowWin32");
#if _WIN32_WINNT_WIN10 #if _WIN32_WINNT_WIN10
IGraphicsCommandQueue* _NewD3D12CommandQueue(D3D12Context* ctx, D3D12Context::Window* windowCtx, IGraphicsContext* parent, IGraphicsCommandQueue* _NewD3D12CommandQueue(D3D12Context* ctx, D3D12Context::Window* windowCtx, IGraphicsContext* parent,
ID3D12CommandQueue** cmdQueueOut); ID3D12CommandQueue** cmdQueueOut);