From 6d080c1a3fcc821c9120f2a3f8d69e57e5e809cb Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 6 Dec 2024 14:51:57 +1000
Subject: [PATCH] GPU: Fix additional GL_POP() causing validation errors

---
 src/core/gpu.cpp    | 2 --
 src/core/gpu_hw.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp
index 6b0e03c14..edc2d1759 100644
--- a/src/core/gpu.cpp
+++ b/src/core/gpu.cpp
@@ -2340,8 +2340,6 @@ bool GPU::DeinterlaceExtractField(u32 dst_bufidx, GPUTexture* src, u32 x, u32 y,
     g_gpu_device->PushUniformBuffer(uniforms, sizeof(uniforms));
     g_gpu_device->SetViewportAndScissor(0, 0, width, height);
     g_gpu_device->Draw(3, 0);
-
-    GL_POP();
   }
 
   dst->MakeReadyForSampling();
diff --git a/src/core/gpu_hw.cpp b/src/core/gpu_hw.cpp
index 7b561383e..14fd6e2a8 100644
--- a/src/core/gpu_hw.cpp
+++ b/src/core/gpu_hw.cpp
@@ -4080,6 +4080,7 @@ void GPU_HW::DownsampleFramebufferAdaptive(GPUTexture* source, u32 left, u32 top
   if (!m_downsample_texture || !level_texture || !weight_texture)
   {
     ERROR_LOG("Failed to create {}x{} RTs for adaptive downsampling", width, height);
+    GL_POP();
     return;
   }