diff options
author | Subv <subv2112@gmail.com> | 2018-03-27 04:52:43 +0200 |
---|---|---|
committer | James Rowe <jroweboy@gmail.com> | 2018-04-07 04:44:46 +0200 |
commit | cb3183212d72836a7b6b196fde9896de66db62e6 (patch) | |
tree | e3205d3fa2830ad781e1a3b014010203fb0b200c /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | GLCache: Specialize the MortonCopy function for the DXT1 texture format. (diff) | |
download | yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar.gz yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar.bz2 yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar.lz yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar.xz yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.tar.zst yuzu-cb3183212d72836a7b6b196fde9896de66db62e6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 09cd4859b..77e2fd039 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -524,10 +524,10 @@ void main() { in vec2 frag_tex_coord; out vec4 color; -uniform sampler2D color_texture; +uniform sampler2D tex[32]; void main() { - color = vec4(1.0, 0.0, 1.0, 0.0); + color = texture(tex[0], frag_tex_coord); } )"; @@ -548,6 +548,15 @@ void main() { state.draw.shader_program = test_shader.shader.handle; state.Apply(); + for (u32 texture = 0; texture < texture_samplers.size(); ++texture) { + // Set the texture samplers to correspond to different texture units + std::string uniform_name = "tex[" + std::to_string(texture) + "]"; + GLint uniform_tex = glGetUniformLocation(test_shader.shader.handle, uniform_name.c_str()); + if (uniform_tex != -1) { + glUniform1i(uniform_tex, TextureUnits::MaxwellTexture(texture).id); + } + } + if (has_ARB_separate_shader_objects) { state.draw.shader_program = 0; state.Apply(); |