OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-16 08:00:05 +00:00
Code Issues Projects Releases Wiki Activity

GL: Bind the textures to the shaders used for drawing.

Browse Source
This commit is contained in:
Subv 2018-03-26 21:52:43 -05:00 committed by James Rowe
parent 65faeb9b2a
commit cb3183212d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -524,10 +524,10 @@ void main() {
in vec2 frag_tex_coord; in vec2 frag_tex_coord;
out vec4 color; out vec4 color;
uniform sampler2D color_texture; uniform sampler2D tex[32];
void main() { 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.draw.shader_program = test_shader.shader.handle;
state.Apply(); 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) { if (has_ARB_separate_shader_objects) {
state.draw.shader_program = 0; state.draw.shader_program = 0;
state.Apply(); state.Apply();