Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-07-17 21:04:37 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-07-18 04:43:52 +0300
commit5993c53a6d36f4dc12910281be83021e45f76ac4 (patch)
treec342317e6f3b1a812ca52e67a1ecf161f2d110e0 /source/blender/editors
parentc14e6cdd5660be471e559206cd5eacee85fa0981 (diff)
Cleanup: GPU: Encapsulate Backface culling
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/gizmo_library/gizmo_draw_utils.c4
-rw-r--r--source/blender/editors/interface/interface_draw.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_draw_utils.c b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
index 01e5a7eacfd..71a364c60d7 100644
--- a/source/blender/editors/gizmo_library/gizmo_draw_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
@@ -84,7 +84,7 @@ void wm_gizmo_geometryinfo_draw(const GizmoGeomInfo *info,
/* We may want to re-visit this, for now disable
* since it causes issues leaving the GL state modified. */
#if 0
- glEnable(GL_CULL_FACE);
+ GPU_face_culling(GPU_CULL_BACK);
GPU_depth_test(true);
#endif
@@ -92,7 +92,7 @@ void wm_gizmo_geometryinfo_draw(const GizmoGeomInfo *info,
#if 0
GPU_depth_test(false);
- glDisable(GL_CULL_FACE);
+ GPU_face_culling(GPU_CULL_NONE);
#endif
GPU_batch_discard(batch);
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 98419b0b0ac..cc5d21c3df3 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1783,8 +1783,7 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec
UI_draw_roundbox_3ub_alpha(
true, rect->xmin, rect->ymin, rect->xmax, rect->ymax, 5.0f, wcol->inner, 255);
- glCullFace(GL_BACK);
- glEnable(GL_CULL_FACE);
+ GPU_face_culling(GPU_CULL_BACK);
/* setup lights */
ui_but_v3_get(but, light);
@@ -1809,7 +1808,7 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec
GPU_batch_draw(sphere);
/* restore */
- glDisable(GL_CULL_FACE);
+ GPU_face_culling(GPU_CULL_NONE);
/* AA circle */
GPUVertFormat *format = immVertexFormat();