summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-08-31 12:03:21 -0300
committerGravatar Yuri Kunde Schlesner2015-12-04 21:58:26 -0800
commit95dbc6eb0ecb945ed6669d5d58db5eb23d86beac (patch)
tree79b8fb27fe66e80c4428ff6051b1dbb7ba756bbb /src
parentMerge pull request #1252 from Subv/cam (diff)
downloadyuzu-95dbc6eb0ecb945ed6669d5d58db5eb23d86beac.tar.gz
yuzu-95dbc6eb0ecb945ed6669d5d58db5eb23d86beac.tar.xz
yuzu-95dbc6eb0ecb945ed6669d5d58db5eb23d86beac.zip
OpenGL: Add support for glFrontFace in the state tracker
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp5
-rw-r--r--src/video_core/renderer_opengl/gl_state.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index c44497fc3..a82372995 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -11,6 +11,7 @@ OpenGLState::OpenGLState() {
11 // These all match default OpenGL values 11 // These all match default OpenGL values
12 cull.enabled = false; 12 cull.enabled = false;
13 cull.mode = GL_BACK; 13 cull.mode = GL_BACK;
14 cull.front_face = GL_CCW;
14 15
15 depth.test_enabled = false; 16 depth.test_enabled = false;
16 depth.test_func = GL_LESS; 17 depth.test_func = GL_LESS;
@@ -67,6 +68,10 @@ void OpenGLState::Apply() {
67 glCullFace(cull.mode); 68 glCullFace(cull.mode);
68 } 69 }
69 70
71 if (cull.front_face != cur_state.cull.front_face) {
72 glFrontFace(cull.front_face);
73 }
74
70 // Depth test 75 // Depth test
71 if (depth.test_enabled != cur_state.depth.test_enabled) { 76 if (depth.test_enabled != cur_state.depth.test_enabled) {
72 if (depth.test_enabled) { 77 if (depth.test_enabled) {
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index 84b3d49bc..b8ab45bb8 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -11,6 +11,7 @@ public:
11 struct { 11 struct {
12 bool enabled; // GL_CULL_FACE 12 bool enabled; // GL_CULL_FACE
13 GLenum mode; // GL_CULL_FACE_MODE 13 GLenum mode; // GL_CULL_FACE_MODE
14 GLenum front_face; // GL_FRONT_FACE
14 } cull; 15 } cull;
15 16
16 struct { 17 struct {