viewport: barebones to handle viewport compositing in gpu_viewport.c

6 files changed, 112 insertions, 0 deletions

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index da7f707e599..4526d120923 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -57,6 +57,7 @@
 #include "GPU_compositing.h"
 #include "GPU_framebuffer.h"
 #include "GPU_material.h"
+#include "GPU_viewport.h"
 
 #include "BIF_gl.h"
 
@@ -582,6 +583,11 @@ static void view3d_main_region_exit(wmWindowManager *wm, ARegion *ar)
 		GPU_fx_compositor_destroy(rv3d->compositor);
 		rv3d->compositor = NULL;
 	}
+
+	if (rv3d->viewport) {
+		GPU_viewport_free(rv3d->viewport);
+		rv3d->viewport = NULL;
+	}
 }
 
 static int view3d_ob_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
@@ -739,6 +745,9 @@ static void view3d_main_region_free(ARegion *ar)
 		if (rv3d->compositor) {
 			GPU_fx_compositor_destroy(rv3d->compositor);
 		}
+		if (rv3d->viewport) {
+			GPU_viewport_free(rv3d->viewport);
+		}
 
 		MEM_freeN(rv3d);
 		ar->regiondata = NULL;
@@ -763,6 +772,7 @@ static void *view3d_main_region_duplicate(void *poin)
 		new->sms = NULL;
 		new->smooth_timer = NULL;
 		new->compositor = NULL;
+		new->viewport = NULL;
 		
 		return new;
 	}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index a9a89a67daa..f2fc143f9c1 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -51,6 +51,7 @@
 #include "ED_transform.h"
 
 #include "GPU_immediate.h"
+#include "GPU_viewport.h"
 
 #include "UI_resources.h"
 
@@ -1088,12 +1089,16 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data
 void view3d_main_region_draw(const bContext *C, ARegion *ar)
 {
 	View3D *v3d = CTX_wm_view3d(C);
+	RegionView3D *rv3d = ar->regiondata;
 
 	if (IS_VIEWPORT_LEGACY(v3d)) {
 		view3d_main_region_draw_legacy(C, ar);
 		return;
 	}
 
+	if (!rv3d->viewport)
+		rv3d->viewport = GPU_viewport_create();
+
 	/* TODO viewport - there is so much to be done, in fact a lot will need to happen in the space_view3d.c
 	 * before we even call the drawing routine, but let's move on for now (dfelinto)
 	 * but this is a provisory way to start seeing things in the viewport */
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 2a5df19e7e8..d33e9456e44 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -64,6 +64,7 @@ set(SRC
 	intern/gpu_select.c
 	intern/gpu_shader.c
 	intern/gpu_texture.c
+	intern/gpu_viewport.c
 
 	gawain/attrib_binding.c
 	gawain/attrib_binding.h
@@ -119,6 +120,7 @@ set(SRC
 	GPU_select.h
 	GPU_shader.h
 	GPU_texture.h
+	GPU_viewport.h
 
 	intern/gpu_codegen.h
 	intern/gpu_private.h
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h
new file mode 100644
index 00000000000..82b537e1c3d
--- /dev/null
+++ b/source/blender/gpu/GPU_viewport.h
@@ -0,0 +1,41 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s):
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file GPU_viewport.h
+ *  \ingroup gpu
+ */
+
+#ifndef __GPU_VIEWPORT_H__
+#define __GPU_VIEWPORT_H__
+
+typedef struct GPUViewport GPUViewport;
+
+GPUViewport *GPU_viewport_create(void);
+
+void GPU_viewport_free(GPUViewport *viewport);
+
+#endif // __GPU_VIEWPORT_H__
diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
new file mode 100644
index 00000000000..bae2fdc552d
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -0,0 +1,52 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s):
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/gpu/intern/gpu_viewport.c
+ *  \ingroup gpu
+ *
+ * System that manages viewport drawing.
+ */
+
+#include "GPU_viewport.h"
+
+#include "MEM_guardedalloc.h"
+
+struct GPUViewport {
+	float pad[4];
+};
+
+GPUViewport *GPU_viewport_create(void)
+{
+	GPUViewport *viewport = MEM_callocN(sizeof(GPUViewport), "GPUViewport");
+	return viewport;
+}
+
+void GPU_viewport_free(GPUViewport *viewport)
+{
+	MEM_freeN(viewport);
+}
+
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index e2d156ee3ca..7e0adf48849 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -45,6 +45,7 @@ struct SmoothView3DStore;
 struct wmTimer;
 struct Material;
 struct GPUFX;
+struct GPUViewport;
 
 /* This is needed to not let VC choke on near and far... old
  * proprietary MS extensions... */
@@ -147,6 +148,7 @@ typedef struct RegionView3D {
 	float rot_axis[3];
 
 	struct GPUFX *compositor;
+	struct GPUViewport *viewport;
 } RegionView3D;
 
 /* 3D ViewPort Struct */