diff options
| author | 2018-03-24 04:06:26 -0400 | |
|---|---|---|
| committer | 2018-03-26 21:16:53 -0400 | |
| commit | 0ee38e136376964c0f80362952130258cc661c60 (patch) | |
| tree | cbad6e4bee75e0b0ed04a82beefdc597ebde3a22 /src | |
| parent | gl_rasterizer: Implement DrawTriangles. (diff) | |
| download | yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.gz yuzu-0ee38e136376964c0f80362952130258cc661c60.tar.xz yuzu-0ee38e136376964c0f80362952130258cc661c60.zip | |
gl_rasterizer: Use 32 texture units instead of 3.
Diffstat (limited to 'src')
| -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 @@ | |||
| 22 | #include "video_core/renderer_opengl/gl_shader_gen.h" | 22 | #include "video_core/renderer_opengl/gl_shader_gen.h" |
| 23 | #include "video_core/renderer_opengl/renderer_opengl.h" | 23 | #include "video_core/renderer_opengl/renderer_opengl.h" |
| 24 | 24 | ||
| 25 | using Maxwell = Tegra::Engines::Maxwell3D::Regs; | ||
| 25 | using PixelFormat = SurfaceParams::PixelFormat; | 26 | using PixelFormat = SurfaceParams::PixelFormat; |
| 26 | using SurfaceType = SurfaceParams::SurfaceType; | 27 | using SurfaceType = SurfaceParams::SurfaceType; |
| 27 | 28 | ||
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: | |||
| 139 | OGLVertexArray hw_vao; | 139 | OGLVertexArray hw_vao; |
| 140 | std::array<bool, 16> hw_vao_enabled_attributes; | 140 | std::array<bool, 16> hw_vao_enabled_attributes; |
| 141 | 141 | ||
| 142 | std::array<SamplerInfo, 3> texture_samplers; | 142 | std::array<SamplerInfo, 32> texture_samplers; |
| 143 | static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; | 143 | static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024; |
| 144 | std::unique_ptr<OGLStreamBuffer> vertex_buffer; | 144 | std::unique_ptr<OGLStreamBuffer> vertex_buffer; |
| 145 | OGLBuffer uniform_buffer; | 145 | 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: | |||
| 85 | struct { | 85 | struct { |
| 86 | GLuint texture_2d; // GL_TEXTURE_BINDING_2D | 86 | GLuint texture_2d; // GL_TEXTURE_BINDING_2D |
| 87 | GLuint sampler; // GL_SAMPLER_BINDING | 87 | GLuint sampler; // GL_SAMPLER_BINDING |
| 88 | } texture_units[3]; | 88 | } texture_units[32]; |
| 89 | 89 | ||
| 90 | struct { | 90 | struct { |
| 91 | GLuint texture_buffer; // GL_TEXTURE_BINDING_BUFFER | 91 | GLuint texture_buffer; // GL_TEXTURE_BINDING_BUFFER |