mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2024-10-22 13:18:19 +02:00
graphics_surface: Fix merge conflicts.
This commit is contained in:
parent
ac19e3d061
commit
666d53299c
@ -14,6 +14,7 @@
|
|||||||
namespace Tegra {
|
namespace Tegra {
|
||||||
|
|
||||||
enum class RenderTargetFormat : u32 {
|
enum class RenderTargetFormat : u32 {
|
||||||
|
NONE = 0x0,
|
||||||
RGBA8_UNORM = 0xD5,
|
RGBA8_UNORM = 0xD5,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -339,9 +339,9 @@ void GraphicsSurfaceWidget::OnUpdate() {
|
|||||||
static_cast<size_t>(Source::RenderTarget0)];
|
static_cast<size_t>(Source::RenderTarget0)];
|
||||||
|
|
||||||
surface_address = rt.Address();
|
surface_address = rt.Address();
|
||||||
surface_width = rt.horiz;
|
surface_width = rt.width;
|
||||||
surface_height = rt.vert;
|
surface_height = rt.height;
|
||||||
if (rt.format != 0) {
|
if (rt.format != Tegra::RenderTargetFormat::NONE) {
|
||||||
surface_format =
|
surface_format =
|
||||||
ConvertToTextureFormat(static_cast<Tegra::RenderTargetFormat>(rt.format));
|
ConvertToTextureFormat(static_cast<Tegra::RenderTargetFormat>(rt.format));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user