diff options
| author | 2018-09-21 18:22:40 -0400 | |
|---|---|---|
| committer | 2018-09-21 18:22:43 -0400 | |
| commit | 90746c33c7735165e9c69c6861b3fbcd8745d95d (patch) | |
| tree | 582b9025676e5f63d5bf602dbdf869debf74d1ef | |
| parent | Merge pull request #1370 from Hedges/GDBClean (diff) | |
| download | yuzu-90746c33c7735165e9c69c6861b3fbcd8745d95d.tar.gz yuzu-90746c33c7735165e9c69c6861b3fbcd8745d95d.tar.xz yuzu-90746c33c7735165e9c69c6861b3fbcd8745d95d.zip | |
gl_state: Remove unused type alias
This isn't used anywhere within the header, so we can remove it, along
with the include that was previously necessary. This also uncovers an
indirect include in the cpp file for the assertion macros.
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index af99132ba..e5173e20a 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <iterator> | 5 | #include <iterator> |
| 6 | #include <glad/glad.h> | 6 | #include <glad/glad.h> |
| 7 | #include "common/assert.h" | ||
| 7 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 8 | #include "video_core/renderer_opengl/gl_state.h" | 9 | #include "video_core/renderer_opengl/gl_state.h" |
| 9 | 10 | ||
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index e3e24b9e7..9a93029d8 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h | |||
| @@ -7,12 +7,8 @@ | |||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <glad/glad.h> | 8 | #include <glad/glad.h> |
| 9 | 9 | ||
| 10 | #include "video_core/engines/maxwell_3d.h" | ||
| 11 | |||
| 12 | namespace OpenGL { | 10 | namespace OpenGL { |
| 13 | 11 | ||
| 14 | using Regs = Tegra::Engines::Maxwell3D::Regs; | ||
| 15 | |||
| 16 | namespace TextureUnits { | 12 | namespace TextureUnits { |
| 17 | 13 | ||
| 18 | struct TextureUnit { | 14 | struct TextureUnit { |