diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-10 13:55:13 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-10 13:55:13 +0300 |
commit | 0ea64c2b9abe500061a6a510874d4f26116ae6aa (patch) | |
tree | a280e231031e2ab362642201ab0d610f71670b64 /source/blender | |
parent | 9d1336b653c1c7a3dd59ab2372bac208e3f0f37d (diff) |
More cleanup
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_renderer.h | 58 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_renderer.c | 36 |
3 files changed, 0 insertions, 96 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index ca11a3c0da0..7e32105a916 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -55,7 +55,6 @@ set(SRC intern/gpu_simple_shader.c intern/gpu_select.c intern/gpu_compositing.c - intern/gpu_renderer.c shaders/gpu_shader_fx_lib.glsl shaders/gpu_shader_fx_ssao_frag.glsl @@ -80,7 +79,6 @@ set(SRC GPU_simple_shader.h GPU_select.h GPU_compositing.h - GPU_renderer.h intern/gpu_codegen.h intern/gpu_extensions_private.h ) diff --git a/source/blender/gpu/GPU_renderer.h b/source/blender/gpu/GPU_renderer.h deleted file mode 100644 index 7ebc864c454..00000000000 --- a/source/blender/gpu/GPU_renderer.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * ***** 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) 2014 Blender Foundation. - * All rights reserved. - * - * Contributor(s): Antony Riakiotakis. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef __GPU_RENDERER_H__ -#define __GPU_RENDERER_H__ - -#include "DNA_listBase.h" - -struct Object; - -/* batches per material sorted by some criterion, ie texture image changes */ -typedef struct SubBatch { - int start; - int len; - void *data; /* extra data relevant to the subbatch, such as image */ -} SubBatch; - - -/* stores data related to the object that can be used for rendering */ -typedef struct MaterialBatch { - int start; - int len; - ListBase subbatches; - struct Object *ob; - void *data; -} MaterialBatch; - - -/* new type of material */ -typedef struct GPUMaterialX { - int datarequest; /* type of data requested from objects */ -} GPUMaterialX; - -void GPU_renderer_material_draw(struct ListBase *materials); - -#endif // __GPU_RENDERER_H__ diff --git a/source/blender/gpu/intern/gpu_renderer.c b/source/blender/gpu/intern/gpu_renderer.c deleted file mode 100644 index f4c0b8d5343..00000000000 --- a/source/blender/gpu/intern/gpu_renderer.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * ***** 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): Antony Riakiotakis. - * - * ***** END GPL LICENSE BLOCK ***** - */ - - -#include "GPU_renderer.h" - - -/* iterates through all added materials, prepares data if needed and draws their meshes */ -void GPU_renderer_material_draw(struct ListBase *materials) -{ - -} |