Vulkan: Fix double-free in the low-memory fallback. Also, reject too-big textures #18475
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -2803,6 +2812,14 @@ bool TextureCacheCommon::PrepareBuildTexture(BuildTexturePlan &plan, TexCacheEnt | |||
| plan.w = gstate.getTextureWidth(0); | |||
| plan.h = gstate.getTextureHeight(0); | |||
|
|
|||
| if (!g_DoubleTextureCoordinates) { | |||
| // Refuse to load invalid-ly sized textures, which can happen through display list corruption. | |||
| if (plan.w > 512 || plan.h > 512) { | |||
There was a problem hiding this comment.
I thought Tactics Ogre or something accessed a 1024x texture at some point? They have predictable behavior, and work fine as long as you use the top left 512x512 of them. I don't think I've ever seen above 1024 though.
-[Unknown]
There was a problem hiding this comment.
Yeah, I had to change this to 1024 later, for this reason (was reported in FF III though).
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We incorrectly assumed that an "entry" would still be valid after decimate, but it might not be, so let's add an exclusion argument to Decimate.
Also, if a game specifies a texture larger than 512x512 and it's not a remaster, we're probably executing a bogus display list, and just need to try not to crash, in the hopes that the situation can rectify itself.