From 46c2b8cf4cfdabf7e2d519188b625d2fe70d169d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 31 Oct 2019 12:18:47 +0000
Subject: [PATCH] Reset pixel unpack state when uploading proxy texture data in
 GL

---
 renderdoc/driver/gl/gl_replay.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 9ebce42a6..0ad0435ad 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -3130,6 +3130,11 @@ void GLReplay::SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t
 
   if(IsCompressedFormat(fmt))
   {
+    PixelUnpackState unpack;
+    unpack.Fetch(true);
+
+    ResetPixelUnpackState(true, 1);
+
     if(target == eGL_TEXTURE_1D)
     {
       drv.glCompressedTextureSubImage1DEXT(tex, target, (GLint)mip, 0, width, fmt,
@@ -3173,6 +3178,8 @@ void GLReplay::SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t
     {
       RDCERR("Unexpected compressed MSAA texture!");
     }
+
+    unpack.Apply(true);
   }
   else
   {
@@ -3185,6 +3192,11 @@ void GLReplay::SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t
       return;
     }
 
+    PixelUnpackState unpack;
+    unpack.Fetch(false);
+
+    ResetPixelUnpackState(false, 1);
+
     if(target == eGL_TEXTURE_1D)
     {
       drv.glTextureSubImage1DEXT(tex, target, (GLint)mip, 0, width, baseformat, datatype, data);
@@ -3271,6 +3283,8 @@ void GLReplay::SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t
       // delete the temporary texture
       drv.glDeleteTextures(1, &uploadTex);
     }
+
+    unpack.Apply(false);
   }
 }