Merge remote-tracking branch 'upstream/12.0-development' into 12.0-testsuite

src/modules/graphics/vulkan/Texture.cpp

@@ -267,7 +267,7 @@ void Texture::setSamplerState(const SamplerState &s)
 {
 	love::graphics::Texture::setSamplerState(s);
 
-	textureSampler = vgfx->getCachedSampler(s);
+	textureSampler = vgfx->getCachedSampler(samplerState);
 }
 
 VkImageLayout Texture::getImageLayout() const

src/modules/physics/box2d/wrap_Shape.cpp

@@ -186,11 +186,11 @@ int w_Shape_testPoint(lua_State *L)
 		float r = (float)luaL_checknumber(L, 4);
 		float px = (float)luaL_checknumber(L, 5);
 		float py = (float)luaL_checknumber(L, 6);
-		result = luax_catchexcept(L, [&]() { t->testPoint(x, y, r, px, py); });
+		luax_catchexcept(L, [&]() { result = t->testPoint(x, y, r, px, py); });
 	}
 	else
 	{
-		result = luax_catchexcept(L, [&]() { t->testPoint(x, y); });
+		luax_catchexcept(L, [&]() { result = t->testPoint(x, y); });
 	}
 	lua_pushboolean(L, result);
 	return 1;