[Bf-blender-cvs] [ec9cdd6e515] temp-lanpr-review: LANPR: Fix multisample texture functions and engine registering functions.

[YimingWu]

Commit: ec9cdd6e515e08627830b0e9ebf483ae1ef3edbd
Author: YimingWu
Date:   Wed Nov 20 20:56:56 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBec9cdd6e515e08627830b0e9ebf483ae1ef3edbd

LANPR: Fix multisample texture functions and engine registering functions.

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

M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager_texture.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index b12e61d7e61..66d3642acc7 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2864,13 +2864,11 @@ void DRW_engine_register(DrawEngineType *draw_engine_type)
 void DRW_engines_register(void)
 {
   RE_engines_register(&DRW_engine_viewport_eevee_type);
-// RE_engines_register(&DRW_engine_viewport_workbench_type); //registered as two DRW_engines
-// below.
+  RE_engines_register(&DRW_engine_viewport_workbench_type);
 #ifdef WITH_LANPR
   RE_engines_register(&DRW_engine_viewport_lanpr_type);
 #endif
 
-  DRW_engine_register(&draw_engine_workbench_solid);
   DRW_engine_register(&draw_engine_workbench_transparent);
 
   DRW_engine_register(&draw_engine_object_type);
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 652f736b33d..87bbe4025ea 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -160,7 +160,7 @@ void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex,
   if (*(tex) == NULL) {
     const float *size = DRW_viewport_size_get();
     *(tex) = GPU_texture_create_2d_multisample(
-        (int)size[0], (int)size[1], format, samples, flags, NULL);
+        (int)size[0], (int)size[1], format, NULL, samples, NULL);
   }
 }
 
@@ -168,7 +168,7 @@ void DRW_texture_ensure_2D_multisample(
     GPUTexture **tex, int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag flags)
 {
   if (*(tex) == NULL) {
-    *(tex) = GPU_texture_create_2d_multisample(w, h, format, samples, flags, NULL);
+    *(tex) = GPU_texture_create_2d_multisample(w, h, format, NULL, samples, NULL);
   }
 }