[Bf-blender-cvs] [33fde699e28] master: Cleanup: GPUState: Remove GPU_state_init()

[Clément Foucault]

Commit: 33fde699e2854fc3b40b8b39be3c67284e39cf7a
Author: Clément Foucault
Date:   Tue Aug 18 21:23:15 2020 +0200
Branches: master
https://developer.blender.org/rB33fde699e2854fc3b40b8b39be3c67284e39cf7a

Cleanup: GPUState: Remove GPU_state_init()

===================================================================

M	source/blender/draw/intern/draw_manager.c
M	source/blender/gpu/GPU_state.h
M	source/blender/gpu/intern/gpu_state.cc
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 11430c4075e..d90d7d36ebc 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1755,8 +1755,6 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
     BLI_rcti_init(&render_rect, 0, size[0], 0, size[1]);
   }
 
-  /* Set the default Blender draw state */
-  GPU_state_init();
   /* Reset state before drawing */
   DRW_state_reset();
 
@@ -2785,8 +2783,6 @@ void DRW_opengl_context_create(void)
   if (!G.background) {
     immActivate();
   }
-  /* Set default Blender OpenGL state */
-  GPU_state_init();
   /* So we activate the window's one afterwards. */
   wm_window_reset_drawable();
 }
diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index 14617eeb614..8bc5c2b8397 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -104,12 +104,6 @@ typedef enum eGPUProvokingVertex {
 extern "C" {
 #endif
 
-/* Initialize
- * - sets the default Blender opengl state, if in doubt, check
- *   the contents of this function
- * - this is called when starting Blender, for opengl rendering. */
-void GPU_state_init(void);
-
 void GPU_blend(eGPUBlend blend);
 void GPU_face_culling(eGPUFaceCullTest culling);
 void GPU_front_facing(bool invert);
diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc
index 796146abdde..f02ec9c5cd4 100644
--- a/source/blender/gpu/intern/gpu_state.cc
+++ b/source/blender/gpu/intern/gpu_state.cc
@@ -345,8 +345,4 @@ GPUStateManager::GPUStateManager(void)
   mutable_state.stencil_reference = 0x00;
 }
 
-void GPU_state_init(void)
-{
-}
-
 /** \} */
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index a8a1817be5e..ac00fc36a89 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -658,9 +658,6 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm,
     wm_window_swap_buffers(win);
 
     // GHOST_SetWindowState(ghostwin, GHOST_kWindowStateModified);
-
-    /* standard state vars for window */
-    GPU_state_init();
   }
   else {
     wm_window_set_drawable(wm, prev_windrawable, false);