Selaa lähdekoodia

gl_rasterizer: Use 32 texture units instead of 3.

bunnei 8 vuotta sitten
vanhempi
commit
0ee38e1363

+ 1 - 0
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/gl_shader_gen.h"
 #include "video_core/renderer_opengl/renderer_opengl.h"
 #include "video_core/renderer_opengl/renderer_opengl.h"
 
 
+using Maxwell = Tegra::Engines::Maxwell3D::Regs;
 using PixelFormat = SurfaceParams::PixelFormat;
 using PixelFormat = SurfaceParams::PixelFormat;
 using SurfaceType = SurfaceParams::SurfaceType;
 using SurfaceType = SurfaceParams::SurfaceType;
 
 

+ 1 - 1
src/video_core/renderer_opengl/gl_rasterizer.h

@@ -139,7 +139,7 @@ private:
     OGLVertexArray hw_vao;
     OGLVertexArray hw_vao;
     std::array<bool, 16> hw_vao_enabled_attributes;
     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;
     static constexpr size_t VERTEX_BUFFER_SIZE = 128 * 1024 * 1024;
     std::unique_ptr<OGLStreamBuffer> vertex_buffer;
     std::unique_ptr<OGLStreamBuffer> vertex_buffer;
     OGLBuffer uniform_buffer;
     OGLBuffer uniform_buffer;

+ 1 - 1
src/video_core/renderer_opengl/gl_state.h

@@ -85,7 +85,7 @@ public:
     struct {
     struct {
         GLuint texture_2d; // GL_TEXTURE_BINDING_2D
         GLuint texture_2d; // GL_TEXTURE_BINDING_2D
         GLuint sampler;    // GL_SAMPLER_BINDING
         GLuint sampler;    // GL_SAMPLER_BINDING
-    } texture_units[3];
+    } texture_units[32];
 
 
     struct {
     struct {
         GLuint texture_buffer; // GL_TEXTURE_BINDING_BUFFER
         GLuint texture_buffer; // GL_TEXTURE_BINDING_BUFFER