summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-01-09 17:42:27 -0300
committerGravatar ReinUsesLisp2019-01-30 19:10:35 -0300
commit220df45b7dfc3654fe0fb4cb6b6eb65c1bfce8e3 (patch)
tree81fa5880e3bd243754922788de2503ae8b738143 /src
parentgl_rasterizer_cache: Move swizzling to textures instead of state (diff)
downloadyuzu-220df45b7dfc3654fe0fb4cb6b6eb65c1bfce8e3.tar.gz
yuzu-220df45b7dfc3654fe0fb4cb6b6eb65c1bfce8e3.tar.xz
yuzu-220df45b7dfc3654fe0fb4cb6b6eb65c1bfce8e3.zip
gl_state: Remove texture target tracking
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_state.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 79d16d1f3..7831bc8cc 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -1022,11 +1022,8 @@ void RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, const Shader& s
1022 if (surface != nullptr) { 1022 if (surface != nullptr) {
1023 unit.texture = 1023 unit.texture =
1024 entry.IsArray() ? surface->TextureLayer().handle : surface->Texture().handle; 1024 entry.IsArray() ? surface->TextureLayer().handle : surface->Texture().handle;
1025 const GLenum target = entry.IsArray() ? surface->TargetLayer() : surface->Target();
1026 surface->UpdateSwizzle(texture.tic.x_source, texture.tic.y_source, texture.tic.z_source, 1025 surface->UpdateSwizzle(texture.tic.x_source, texture.tic.y_source, texture.tic.z_source,
1027 texture.tic.w_source); 1026 texture.tic.w_source);
1028 unit.texture = handle;
1029 unit.target = target;
1030 } else { 1027 } else {
1031 // Can occur when texture addr is null or its memory is unmapped/invalid 1028 // Can occur when texture addr is null or its memory is unmapped/invalid
1032 unit.texture = 0; 1029 unit.texture = 0;
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:
126 struct TextureUnit { 126 struct TextureUnit {
127 GLuint texture; // GL_TEXTURE_BINDING_2D 127 GLuint texture; // GL_TEXTURE_BINDING_2D
128 GLuint sampler; // GL_SAMPLER_BINDING 128 GLuint sampler; // GL_SAMPLER_BINDING
129 GLenum target;
130 129
131 void Unbind() { 130 void Unbind() {
132 texture = 0; 131 texture = 0;
@@ -135,7 +134,6 @@ public:
135 void Reset() { 134 void Reset() {
136 Unbind(); 135 Unbind();
137 sampler = 0; 136 sampler = 0;
138 target = GL_TEXTURE_2D;
139 } 137 }
140 }; 138 };
141 std::array<TextureUnit, Tegra::Engines::Maxwell3D::Regs::NumTextureSamplers> texture_units; 139 std::array<TextureUnit, Tegra::Engines::Maxwell3D::Regs::NumTextureSamplers> texture_units;