thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the glslang submodule, fix the build afterwards.

Browse source
This commit is contained in:
Henrik Rydgård 2020-03-03 22:19:32 +01:00
parent 95b621fba5
commit f8a0ba3b86
17 changed files with 123 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/ComboKeyMappingScreen.cpp
View file

@ -65,7 +65,7 @@ void Combo_keyScreen::CreateViews() {
gridsettings.fillCells = true;
GridLayout *grid = rightScroll_->Add(new GridLayout(gridsettings, new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
bool *toggle;
bool *toggle = nullptr;
memset(array, 0, sizeof(array));
switch (*mode) {
case 0:
@ -93,6 +93,10 @@ void Combo_keyScreen::CreateViews() {
for (int i = 0; i < 16; i++)
array[i] = (0x01 == ((g_Config.iCombokey4 >> i) & 0x01));
break;
default:
// This shouldn't happen, let's just not crash.
toggle = &g_Config.bComboToggle0;
break;
}
std::map<std::string, ImageID> keyImages;