This commit is contained in:
Henrik Rydgard committed 2015-02-09 23:12:51 +01:00
1 parent 4abe2f4309
commit 26bc250e9b
2 files changed
+2 -3

No files matched your search

+1 -2
View File
@@ -92,7 +92,7 @@ HMODULE loadDllLastVersion(unsigned int* version, bool debugVersion) {
}
std::wstring dllfname;
makeD3DX9dllFilename_by_versionW(dllfname, *version, debugVersion);
makeD3DX9dllFilename_by_versionW(dllfname, version ? *version : 0, debugVersion);
HMODULE hm = ::LoadLibraryW(dllfname.c_str());
return hm;
}
@@ -123,7 +123,6 @@ int LoadD3DX9Dynamic(bool debugVersion) {
ELOG("Failed to find D3DX dll.");
return 0;
}
void* ptr = NULL;
const int NERROR = -1;
int _begin = 0;
+1 -1
View File
@@ -5,6 +5,7 @@
#include "gfx/texture.h"
#include "gfx_es2/draw_buffer.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/gl_state.h"
UIContext::UIContext()
: uishader_(0), uitexture_(0), uidrawbuffer_(0), uidrawbufferTop_(0) {
@@ -42,7 +43,6 @@ void UIContext::Begin() {
thin3d_->SetRenderState(T3DRenderState::CULL_MODE, T3DCullMode::NO_CULL);
thin3d_->SetTexture(0, uitexture_);
thin3d_->SetScissorEnabled(false);
UIBegin(uishader_);
}