diff options
author | bunnei <bunneidev@gmail.com> | 2018-03-24 09:06:26 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-03-27 03:16:53 +0200 |
commit | 0ee38e136376964c0f80362952130258cc661c60 (patch) | |
tree | cbad6e4bee75e0b0ed04a82beefdc597ebde3a22 | |
parent | gl_rasterizer: Implement DrawTriangles. (diff) | |
download | yuzu-0ee38e136376964c0f80362952130258cc661c60.tar yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.gz yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.bz2 yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.lz yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.xz yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.zst yuzu-0ee38e136376964c0f80362952130258cc661c60.zip |
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index c44ce4a18..fae9abd19 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -22,6 +22,7 @@ #include "video_core/renderer_opengl/gl_shader_gen.h" #include "video_core/renderer_opengl/renderer_opengl.h" +using Maxwell = Tegra::Engines::Maxwell3D::Regs; using PixelFormat = SurfaceParams::PixelFormat; using SurfaceType = SurfaceParams::SurfaceType; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index b387f383b..71a5437a2 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -139,7 +139,7 @@ private: OGLVertexArray hw_vao; std::array<bool, 16> hw_vao_enabled_attributes; - std::array<SamplerInfo, 3> texture_samplers; + std::array<SamplerInfo, 32> texture_samplers; static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; std::unique_ptr<OGLStreamBuffer> vertex_buffer; OGLBuffer uniform_buffer; diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 940575dfa..c1f4efc8c 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -85,7 +85,7 @@ public: struct { GLuint texture_2d; // GL_TEXTURE_BINDING_2D GLuint sampler; // GL_SAMPLER_BINDING - } texture_units[3]; + } texture_units[32]; struct { GLuint texture_buffer; // GL_TEXTURE_BINDING_BUFFER |