[Bf-blender-cvs] [a30ad3634d2] master: Cleanup: DRW: Replace 0 by NULL in GPU_context_create calls
Clément Foucault
noreply at git.blender.org
Tue Sep 8 04:15:56 CEST 2020
Commit: a30ad3634d2ed489d0c285b2ea77bc1c69e23826
Author: Clément Foucault
Date: Tue Sep 8 03:19:15 2020 +0200
Branches: master
https://developer.blender.org/rBa30ad3634d2ed489d0c285b2ea77bc1c69e23826
Cleanup: DRW: Replace 0 by NULL in GPU_context_create calls
This was left from a previous refactor.
===================================================================
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/tests/shaders_test.cc
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 5a676bf4004..f23cca41215 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -526,7 +526,7 @@ static void eevee_lightbake_context_enable(EEVEE_LightBake *lbake)
if (lbake->gl_context) {
DRW_opengl_render_context_enable(lbake->gl_context);
if (lbake->gpu_context == NULL) {
- lbake->gpu_context = GPU_context_create(0);
+ lbake->gpu_context = GPU_context_create(NULL);
}
DRW_gpu_render_context_enable(lbake->gpu_context);
}
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index d2a95f9b7b3..e6d51bce54e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2771,7 +2771,7 @@ void DRW_opengl_context_create(void)
DST.gl_context = WM_opengl_context_create();
WM_opengl_context_activate(DST.gl_context);
/* Be sure to create gpu_context too. */
- DST.gpu_context = GPU_context_create(0);
+ DST.gpu_context = GPU_context_create(NULL);
/* So we activate the window's one afterwards. */
wm_window_reset_drawable();
}
diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc
index a3a0b792a24..b82746e4609 100644
--- a/source/blender/draw/tests/shaders_test.cc
+++ b/source/blender/draw/tests/shaders_test.cc
@@ -27,7 +27,7 @@ class DrawTest : public ::testing::Test {
GHOST_GLSettings glSettings = {0};
ghost_system = GHOST_CreateSystem();
ghost_context = GHOST_CreateOpenGLContext(ghost_system, glSettings);
- context = GPU_context_create(0);
+ context = GPU_context_create(NULL);
GPU_init();
DRW_draw_state_init_gtests(GPU_SHADER_CFG_DEFAULT);
}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8c61fd5b971..2d581a4765e 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1113,7 +1113,7 @@ void *RE_gl_context_get(Render *re)
void *RE_gpu_context_get(Render *re)
{
if (re->gpu_context == NULL) {
- re->gpu_context = GPU_context_create(0);
+ re->gpu_context = GPU_context_create(NULL);
}
return re->gpu_context;
}
More information about the Bf-blender-cvs
mailing list