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

gl_state: Remove front face tracking

This commit is contained in:
ReinUsesLisp 2019-12-25 19:46:04 -03:00
parent d2d5554296
commit 925521da5f
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1025,7 +1025,7 @@ void RasterizerOpenGL::SyncCullMode() {
state.cull.mode = MaxwellToGL::CullFace(regs.cull.cull_face); state.cull.mode = MaxwellToGL::CullFace(regs.cull.cull_face);
} }
state.cull.front_face = MaxwellToGL::FrontFace(regs.cull.front_face); glFrontFace(MaxwellToGL::FrontFace(regs.cull.front_face));
} }
void RasterizerOpenGL::SyncPrimitiveRestart() { void RasterizerOpenGL::SyncPrimitiveRestart() {

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

@ -170,10 +170,6 @@ void OpenGLState::ApplyCulling() {
if (UpdateValue(cur_state.cull.mode, cull.mode)) { if (UpdateValue(cur_state.cull.mode, cull.mode)) {
glCullFace(cull.mode); glCullFace(cull.mode);
} }
if (UpdateValue(cur_state.cull.front_face, cull.front_face)) {
glFrontFace(cull.front_face);
}
} }
void OpenGLState::ApplyRasterizerDiscard() { void OpenGLState::ApplyRasterizerDiscard() {

1
src/video_core/renderer_opengl/gl_state.h
View File

@ -34,7 +34,6 @@ public:
struct { struct {
bool enabled = false; // GL_CULL_FACE bool enabled = false; // GL_CULL_FACE
GLenum mode = GL_BACK; // GL_CULL_FACE_MODE GLenum mode = GL_BACK; // GL_CULL_FACE_MODE
GLenum front_face = GL_CCW; // GL_FRONT_FACE
} cull; } cull;
struct { struct {

4
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -571,6 +571,10 @@ void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x,
state.textures[0] = screen_info.display_texture; state.textures[0] = screen_info.display_texture;
state.framebuffer_srgb.enabled = screen_info.display_srgb; state.framebuffer_srgb.enabled = screen_info.display_srgb;
state.Apply(); state.Apply();
// TODO: Signal state tracker about these changes
glFrontFace(GL_CW);
glNamedBufferSubData(vertex_buffer.handle, 0, sizeof(vertices), std::data(vertices)); glNamedBufferSubData(vertex_buffer.handle, 0, sizeof(vertices), std::data(vertices));
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
// Restore default state // Restore default state