octo/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #593 from bunnei/fix-swizzle

Browse Source 
gl_state: Fix state management for texture swizzle.
This commit is contained in:
bunnei
2018-06-26 22:05:49 -04:00
committed by GitHub
parent 73de9bab1a 8447d20a11
commit dfac394e60
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_core/renderer_opengl/gl_state.cpp
View File

@@ -48,12 +48,7 @@ OpenGLState::OpenGLState() {
logic_op = GL_COPY;
for (auto& texture_unit : texture_units) {
texture_unit.texture_2d = 0;
texture_unit.sampler = 0;
texture_unit.swizzle.r = GL_RED;
texture_unit.swizzle.g = GL_GREEN;
texture_unit.swizzle.b = GL_BLUE;
texture_unit.swizzle.a = GL_ALPHA;
texture_unit.Reset();
}
draw.read_framebuffer = 0;
@@ -286,10 +281,10 @@ void OpenGLState::Apply() const {
cur_state = *this;
}
OpenGLState& OpenGLState::ResetTexture(GLuint handle) {
OpenGLState& OpenGLState::UnbindTexture(GLuint handle) {
for (auto& unit : texture_units) {
if (unit.texture_2d == handle) {
unit.texture_2d = 0;
unit.Unbind();
}
}
return *this;