Merge pull request #13852 from unknownbrackets/warnings

A few more warning fixes
hrydgard · Jan 2, 2021 · 1282653 · 1282653
2 parents fa466d2 + 64f3830
commit 1282653
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Common/GPU/ShaderWriter.cpp b/Common/GPU/ShaderWriter.cpp
@@ -205,7 +205,7 @@ void ShaderWriter::BeginFSMain(Slice<UniformDef> uniforms, Slice<VaryingDef> var
 		break;
 	case HLSL_D3D9:
 		for (auto &uniform : uniforms) {
-			F("  %s %s : %s;\n", uniform.type, uniform.name, uniform.index);
+			F("  %s %s : register(c%d);\n", uniform.type, uniform.name, uniform.index);
 		}
 		// Let's do the varyings as parameters to main, no struct.
 		C("vec4 main(");

diff --git a/Core/Debugger/WebSocket/DisasmSubscriber.cpp b/Core/Debugger/WebSocket/DisasmSubscriber.cpp
@@ -262,7 +262,7 @@ uint32_t WebSocketDisasmState::RoundAddressUp(uint32_t addr) {
 //  - addressHex: string indicating base address in hexadecimal (may be 64 bit.)
 void WebSocketDisasmState::Base(DebuggerRequest &req) {
 	JsonWriter &json = req.Respond();
-	json.writeString("addressHex", StringFromFormat("%016llx", Memory::base));
+	json.writeString("addressHex", StringFromFormat("%016llx", (uintptr_t)Memory::base));
 }
 
 // Disassemble a range of memory as CPU instructions (memory.disasm)

diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp
@@ -217,6 +217,7 @@ class PsmfPlayer {
 	}
 	PsmfPlayer(const PsmfPlayerCreateData *data);
 	~PsmfPlayer() {
+		AbortFinish();
 		if (mediaengine) 
 			delete mediaengine;
 		pspFileSystem.CloseFile(filehandle);

diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp
@@ -204,7 +204,7 @@ static std::string ReadShaderSrc(const std::string &filename) {
 		return "";
 
 	std::string src(data, sz);
-	free(data);
+	delete[] data;
 	return src;
 }
 

diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -383,7 +383,7 @@ static std::string ReadShaderSrc(const std::string &filename) {
 		return "";
 
 	std::string src(data, sz);
-	free(data);
+	delete[] data;
 	return src;
 }
 

diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp
@@ -103,7 +103,7 @@ class SavedataPopupScreen : public PopupScreen {
 			LinearLayout *topright = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1.0f));
 			topright->SetSpacing(1.0f);
 			topright->Add(new TextView(savedata_title, ALIGN_LEFT | FLAG_WRAP_TEXT, false))->SetTextColor(textStyle.fgColor);
-			topright->Add(new TextView(StringFromFormat("%d kB", ginfo->gameSize / 1024), 0, true))->SetTextColor(textStyle.fgColor);
+			topright->Add(new TextView(StringFromFormat("%lld kB", ginfo->gameSize / 1024), 0, true))->SetTextColor(textStyle.fgColor);
 			topright->Add(new TextView(GetFileDateAsString(savePath_ + "/PARAM.SFO"), 0, true))->SetTextColor(textStyle.fgColor);
 			toprow->Add(topright);
 			content->Add(new Spacer(3.0));
@@ -292,7 +292,7 @@ void SavedataButton::Draw(UIContext &dc) {
 	}
 	if (subtitle_.empty() && ginfo->gameSize > 0) {
 		std::string savedata_title = ginfo->paramSFO.GetValueString("SAVEDATA_TITLE");
-		subtitle_ = CleanSaveString(savedata_title) + StringFromFormat(" (%d kB)", ginfo->gameSize / 1024);
+		subtitle_ = CleanSaveString(savedata_title) + StringFromFormat(" (%lld kB)", ginfo->gameSize / 1024);
 	}
 
 	dc.MeasureText(dc.GetFontStyle(), 1.0f, 1.0f, title_.c_str(), &tw, &th, 0);