[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49726] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: Added EOL property to new files in gpu directory .
Jason Wilkins
Jason.A.Wilkins at gmail.com
Thu Aug 9 08:15:14 CEST 2012
Revision: 49726
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49726
Author: jwilkins
Date: 2012-08-09 06:15:14 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
Added EOL property to new files in gpu directory.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_glew.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_glsl.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_inline.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_safety.h
Property Changed:
----------------
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_glew.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_glsl.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_inline.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_internal.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gl11.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_safety.h
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c 2012-08-09 06:03:37 UTC (rev 49725)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c 2012-08-09 06:15:14 UTC (rev 49726)
@@ -1,121 +1,121 @@
-/*
-* ***** 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) 2012 Blender Foundation.
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Jason Wilkins.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
-
-/** \file blender/gpu/intern/gpu_aspect.c
-* \ingroup gpu
-*/
-
-#include "intern/gpu_aspect.h"
-
-#include "MEM_guardedalloc.h"
-
-
-
-static GPUaspectfuncs ** GPU_ASPECT_FUNCS = NULL;
-
-static size_t aspect_max = 0;
-static size_t aspect_free = 0;
-static size_t aspect_fill = 0;
-
-
-
-void gpuInitializeAspects(void)
-{
- const size_t count = 100;
-
- GPU_ASPECT_FUNCS = MEM_callocN(count * sizeof(GPUaspectfuncs*), "aspect functions");
-
- aspect_max = count;
- aspect_free = count;
- aspect_fill = 0;
-}
-
-
-
-void gpuShutdownAspects(void)
-{
- MEM_freeN(GPU_ASPECT_FUNCS);
- GPU_ASPECT_FUNCS = NULL;
-
- aspect_max = 0;
- aspect_fill = 0;
- aspect_free = 0;
-}
-
-
-
-void gpuGenAspects(GLsizei count, GLuint* aspects)
-{
- GLuint src, dst;
-
- if (count == 0) {
- return;
- }
-
- if (count > aspect_free) {
- aspect_max = aspect_max + count - aspect_free;
- GPU_ASPECT_FUNCS = MEM_reallocN(GPU_ASPECT_FUNCS, aspect_max * sizeof(GPUaspectfuncs*));
- aspect_free = count;
- }
-
- src = aspect_fill;
- dst = 0;
-
- while (dst < count) {
- if (!GPU_ASPECT_FUNCS[src]) {
- aspects[dst] = src;
- dst++;
- aspect_fill = dst;
- aspect_free--;
- }
-
- src++;
- }
-}
-
-
-
-void gpuAspectFuncs(GLuint aspect, GPUaspectfuncs* aspectFuncs)
-{
- GPU_ASPECT_FUNCS[aspect] = aspectFuncs;
-}
-
-
-
-GLboolean gpuBeginAspect(GLuint aspect, const GLvoid* object)
-{
- GPUaspectfuncs* aspectFuncs = GPU_ASPECT_FUNCS[aspect];
- return aspectFuncs ? aspectFuncs->begin(aspectFuncs->param, object) : GL_TRUE;
-}
-
-
-
-GLboolean gpuEndAspect(GLuint aspect, const GLvoid* object)
-{
- GPUaspectfuncs* aspectFuncs = GPU_ASPECT_FUNCS[aspect];
- return aspectFuncs ? aspectFuncs->end(aspectFuncs->param, object) : GL_TRUE;
-}
+/*
+* ***** 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) 2012 Blender Foundation.
+* All rights reserved.
+*
+* The Original Code is: all of this file.
+*
+* Contributor(s): Jason Wilkins.
+*
+* ***** END GPL LICENSE BLOCK *****
+*/
+
+/** \file blender/gpu/intern/gpu_aspect.c
+* \ingroup gpu
+*/
+
+#include "intern/gpu_aspect.h"
+
+#include "MEM_guardedalloc.h"
+
+
+
+static GPUaspectfuncs ** GPU_ASPECT_FUNCS = NULL;
+
+static size_t aspect_max = 0;
+static size_t aspect_free = 0;
+static size_t aspect_fill = 0;
+
+
+
+void gpuInitializeAspects(void)
+{
+ const size_t count = 100;
+
+ GPU_ASPECT_FUNCS = MEM_callocN(count * sizeof(GPUaspectfuncs*), "aspect functions");
+
+ aspect_max = count;
+ aspect_free = count;
+ aspect_fill = 0;
+}
+
+
+
+void gpuShutdownAspects(void)
+{
+ MEM_freeN(GPU_ASPECT_FUNCS);
+ GPU_ASPECT_FUNCS = NULL;
+
+ aspect_max = 0;
+ aspect_fill = 0;
+ aspect_free = 0;
+}
+
+
+
+void gpuGenAspects(GLsizei count, GLuint* aspects)
+{
+ GLuint src, dst;
+
+ if (count == 0) {
+ return;
+ }
+
+ if (count > aspect_free) {
+ aspect_max = aspect_max + count - aspect_free;
+ GPU_ASPECT_FUNCS = MEM_reallocN(GPU_ASPECT_FUNCS, aspect_max * sizeof(GPUaspectfuncs*));
+ aspect_free = count;
+ }
+
+ src = aspect_fill;
+ dst = 0;
+
+ while (dst < count) {
+ if (!GPU_ASPECT_FUNCS[src]) {
+ aspects[dst] = src;
+ dst++;
+ aspect_fill = dst;
+ aspect_free--;
+ }
+
+ src++;
+ }
+}
+
+
+
+void gpuAspectFuncs(GLuint aspect, GPUaspectfuncs* aspectFuncs)
+{
+ GPU_ASPECT_FUNCS[aspect] = aspectFuncs;
+}
+
+
+
+GLboolean gpuBeginAspect(GLuint aspect, const GLvoid* object)
+{
+ GPUaspectfuncs* aspectFuncs = GPU_ASPECT_FUNCS[aspect];
+ return aspectFuncs ? aspectFuncs->begin(aspectFuncs->param, object) : GL_TRUE;
+}
+
+
+
+GLboolean gpuEndAspect(GLuint aspect, const GLvoid* object)
+{
+ GPUaspectfuncs* aspectFuncs = GPU_ASPECT_FUNCS[aspect];
+ return aspectFuncs ? aspectFuncs->end(aspectFuncs->param, object) : GL_TRUE;
+}
Property changes on: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h 2012-08-09 06:03:37 UTC (rev 49725)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h 2012-08-09 06:15:14 UTC (rev 49726)
@@ -1,72 +1,72 @@
-/*
-* ***** 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) 2012 Blender Foundation.
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Jason Wilkins.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
-
-/** \file blender/gpu/intern/gpu_aspect.h
-* \ingroup gpu
-*/
-
-#ifndef GPU_ASPECT_H
-#define GPU_ASPECT_H
-
-
-
-#include "intern/gpu_glew.h"
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-void gpuInitializeAspects(void);
-void gpuShutdownAspects(void);
-
-void gpuGenAspects(GLsizei count, GLuint* aspects);
-void gpuDeleteAspects(GLsizei count, const GLuint* aspects);
-
-typedef struct GPUaspectfuncs {
- GLboolean (*begin)(GLvoid* param, GLvoid* object);
- GLboolean (*end)(GLvoid* param, GLvoid* object);
- GLvoid* param;
-} GPUaspectfuncs;
-
-void gpuAspectFuncs(GLuint aspect, GPUaspectfuncs* aspectFuncs);
-
-GLboolean gpuBeginAspect(GLuint aspect, const GLvoid* object);
-GLboolean gpuEndAspect(GLuint aspect, const GLvoid* object);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* GPU_ASPECT_H */
+/*
+* ***** 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) 2012 Blender Foundation.
+* All rights reserved.
+*
+* The Original Code is: all of this file.
+*
+* Contributor(s): Jason Wilkins.
+*
+* ***** END GPL LICENSE BLOCK *****
+*/
+
+/** \file blender/gpu/intern/gpu_aspect.h
+* \ingroup gpu
+*/
+
+#ifndef GPU_ASPECT_H
+#define GPU_ASPECT_H
+
+
+
+#include "intern/gpu_glew.h"
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+void gpuInitializeAspects(void);
+void gpuShutdownAspects(void);
+
+void gpuGenAspects(GLsizei count, GLuint* aspects);
+void gpuDeleteAspects(GLsizei count, const GLuint* aspects);
+
+typedef struct GPUaspectfuncs {
+ GLboolean (*begin)(GLvoid* param, GLvoid* object);
+ GLboolean (*end)(GLvoid* param, GLvoid* object);
+ GLvoid* param;
+} GPUaspectfuncs;
+
+void gpuAspectFuncs(GLuint aspect, GPUaspectfuncs* aspectFuncs);
+
+GLboolean gpuBeginAspect(GLuint aspect, const GLvoid* object);
+GLboolean gpuEndAspect(GLuint aspect, const GLvoid* object);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /* GPU_ASPECT_H */
Property changes on: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c 2012-08-09 06:03:37 UTC (rev 49725)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c 2012-08-09 06:15:14 UTC (rev 49726)
@@ -1,32 +1,32 @@
-/*
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list