mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
Up shader storage version.
Fix some compilation warnings.
This commit is contained in:
parent
bb2221d55f
commit
3f9911ab9d
|
@ -70,7 +70,7 @@ LRESULT CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPar
|
|||
dc.CreateCompatibleDC(NULL);
|
||||
dc.SelectFont(dlgItem.GetFont());
|
||||
SIZE size;
|
||||
dc.GetTextExtent(RomName.c_str(), RomName.length(), &size);
|
||||
dc.GetTextExtent(RomName.c_str(), static_cast<int>(RomName.length()), &size);
|
||||
|
||||
RECT Rect;
|
||||
dlgItem.GetWindowRect(&Rect);
|
||||
|
|
|
@ -75,14 +75,14 @@ void COsdTab::LoadFonts(void)
|
|||
if (hParent == TVI_ROOT) {
|
||||
tv.item.mask = TVIF_TEXT;
|
||||
tv.item.pszText = (LPWSTR)FontName.c_str();
|
||||
tv.item.cchTextMax = FontName.length();
|
||||
tv.item.cchTextMax = static_cast<int>(FontName.length());
|
||||
tv.hInsertAfter = TVI_SORT;
|
||||
tv.hParent = TVI_ROOT;
|
||||
hParent = m_Fonts.InsertItem(&tv);
|
||||
}
|
||||
tv.item.mask = TVIF_TEXT;
|
||||
tv.item.pszText = (LPWSTR)FontFile.c_str();
|
||||
tv.item.cchTextMax = FontFile.length();
|
||||
tv.item.cchTextMax = static_cast<int>(FontFile.length());
|
||||
tv.hInsertAfter = TVI_SORT;
|
||||
tv.hParent = hParent;
|
||||
m_Fonts.InsertItem(&tv);
|
||||
|
|
|
@ -208,7 +208,7 @@ void CTextureEnhancementTab::SaveDirectory(int EditCtrl, wchar_t * txPath)
|
|||
int TxtLen = EditWnd.GetWindowTextLength();
|
||||
std::wstring Path;
|
||||
Path.resize(TxtLen + 1);
|
||||
EditWnd.GetWindowText((wchar_t *)Path.data(), Path.size());
|
||||
EditWnd.GetWindowText((wchar_t *)Path.data(), static_cast<int>(Path.size()));
|
||||
|
||||
WIN32_FIND_DATA FindData;
|
||||
HANDLE hFindFile = FindFirstFile(Path.c_str(), &FindData);
|
||||
|
@ -269,7 +269,7 @@ void CTextureEnhancementTab::SelectDir(wchar_t * Title, int EditCtrl)
|
|||
int TxtLen = EditWnd.GetWindowTextLength();
|
||||
std::wstring EditText;
|
||||
EditText.resize(TxtLen + 1);
|
||||
EditWnd.GetWindowText((wchar_t *)EditText.data(), EditText.size());
|
||||
EditWnd.GetWindowText((wchar_t *)EditText.data(), static_cast<int>(EditText.size()));
|
||||
|
||||
bi.hwndOwner = m_hWnd;
|
||||
bi.pidlRoot = NULL;
|
||||
|
|
|
@ -102,7 +102,7 @@ private:
|
|||
static BOOL CALLBACK SetTool(HWND hTool, LPARAM pDlg)
|
||||
{
|
||||
T* pT = (T*)pDlg;
|
||||
int idTool = ::GetWindowLong(hTool, GWL_ID);
|
||||
auto idTool = ::GetWindowLong(hTool, GWL_ID);
|
||||
if (idTool != IDC_STATIC)
|
||||
{
|
||||
CToolInfo ToolInfo(pT->m_uToolFlags, hTool, 0, 0, (LPTSTR)idTool);
|
||||
|
|
|
@ -978,8 +978,8 @@ public:
|
|||
{
|
||||
aTexWrap[t][0] = 1.0;
|
||||
aTexWrap[t][1] = 1.0;
|
||||
aTexClamp[t][0] = f32(pTexture->width) - 1.0;
|
||||
aTexClamp[t][1] = f32(pTexture->height) - 1.0;
|
||||
aTexClamp[t][0] = f32(pTexture->width) - 1.0f;
|
||||
aTexClamp[t][1] = f32(pTexture->height) - 1.0f;
|
||||
aTexWrapEn[t][0] = 0.0;
|
||||
aTexWrapEn[t][1] = 0.0;
|
||||
aTexClampEn[t][0] = 1.0;
|
||||
|
@ -992,8 +992,8 @@ public:
|
|||
{
|
||||
aTexWrap[t][0] = f32(1 << pTile->masks) * pTexture->hdRatioS;
|
||||
aTexWrap[t][1] = f32(1 << pTile->maskt) * pTexture->hdRatioT;
|
||||
aTexClamp[t][0] = (pTile->flrs - pTile->fuls + 1.0) * pTexture->hdRatioS - 1.0;
|
||||
aTexClamp[t][1] = (pTile->flrt - pTile->fult + 1.0) * pTexture->hdRatioT - 1.0;
|
||||
aTexClamp[t][0] = (pTile->flrs - pTile->fuls + 1.0f) * pTexture->hdRatioS - 1.0f;
|
||||
aTexClamp[t][1] = (pTile->flrt - pTile->fult + 1.0f) * pTexture->hdRatioT - 1.0f;
|
||||
aTexWrapEn[t][0] = f32(pTile->masks == 0 ? 0 : 1);
|
||||
aTexWrapEn[t][1] = f32(pTile->maskt == 0 ? 0 : 1);
|
||||
aTexClampEn[t][0] = f32(pTile->masks == 0 ? 1 : pTile->clamps);
|
||||
|
|
|
@ -20,7 +20,7 @@ namespace glsl {
|
|||
bool _saveCombinerKeys(const graphics::Combiners & _combiners) const;
|
||||
bool _loadFromCombinerKeys(graphics::Combiners & _combiners);
|
||||
|
||||
const u32 m_formatVersion = 0x2CU;
|
||||
const u32 m_formatVersion = 0x2DU;
|
||||
const u32 m_keysFormatVersion = 0x04;
|
||||
const opengl::GLInfo & m_glinfo;
|
||||
opengl::CachedUseProgram * m_useProgram;
|
||||
|
|
Loading…
Reference in New Issue
Block a user