From 704744bb72972f99fa992e286b3de5967b48af37 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 6 Jan 2019 23:02:27 -0300
Subject: gl_rasterizer_cache: Move swizzling to textures instead of state

---
 src/video_core/renderer_opengl/gl_state.h | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_state.h')

diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index a5a7c0920..ced602bf6 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -127,19 +127,9 @@ public:
         GLuint texture; // GL_TEXTURE_BINDING_2D
         GLuint sampler; // GL_SAMPLER_BINDING
         GLenum target;
-        struct {
-            GLint r; // GL_TEXTURE_SWIZZLE_R
-            GLint g; // GL_TEXTURE_SWIZZLE_G
-            GLint b; // GL_TEXTURE_SWIZZLE_B
-            GLint a; // GL_TEXTURE_SWIZZLE_A
-        } swizzle;
 
         void Unbind() {
             texture = 0;
-            swizzle.r = GL_RED;
-            swizzle.g = GL_GREEN;
-            swizzle.b = GL_BLUE;
-            swizzle.a = GL_ALPHA;
         }
 
         void Reset() {
-- 
cgit v1.2.3


From 220df45b7dfc3654fe0fb4cb6b6eb65c1bfce8e3 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 9 Jan 2019 17:42:27 -0300
Subject: gl_state: Remove texture target tracking

---
 src/video_core/renderer_opengl/gl_state.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_state.h')

diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index ced602bf6..9e1eda5b1 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -126,7 +126,6 @@ public:
     struct TextureUnit {
         GLuint texture; // GL_TEXTURE_BINDING_2D
         GLuint sampler; // GL_SAMPLER_BINDING
-        GLenum target;
 
         void Unbind() {
             texture = 0;
@@ -135,7 +134,6 @@ public:
         void Reset() {
             Unbind();
             sampler = 0;
-            target = GL_TEXTURE_2D;
         }
     };
     std::array<TextureUnit, Tegra::Engines::Maxwell3D::Regs::NumTextureSamplers> texture_units;
-- 
cgit v1.2.3