[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60269] branches/soc-2013-viewport_fx/ source/blender: fixed linker errors

[Jason Wilkins]

Revision: 60269
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60269
Author:   jwilkins
Date:     2013-09-20 18:11:44 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
fixed linker errors

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
    branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -236,7 +236,7 @@
 
 
 
-void gpu_basic_shader_bind(void)
+void gpu_basic_bind(void)
 {
 	bool glsl_support = GPU_glsl_support();
 
@@ -287,7 +287,7 @@
 
 
 
-void gpu_basic_shader_unbind(void)
+void gpu_basic_unbind(void)
 {
 	if (GPU_glsl_support())
 		GPU_shader_unbind();
@@ -307,7 +307,7 @@
 
 
 
-bool GPU_basic_shader_needs_normals(void)
+bool GPU_basic_needs_normals(void)
 {
 	return BASIC_SHADER.options & GPU_BASIC_LIGHTING; // Temporary hack. Should be solved outside of this file.
 }

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -192,7 +192,7 @@
 
 
 
-void gpu_initialize_aspect_impl(void)
+void gpu_blender_aspect_init(void)
 {
 	GPU_gen_aspects(1, &GPU_ASPECT_FONT);
 	GPU_gen_aspects(1, &GPU_ASPECT_BASIC);
@@ -209,7 +209,7 @@
 
 
 
-void gpu_shutdown_aspect_impl(void)
+void gpu_blender_aspect_exit(void)
 {
 	GPU_delete_aspects(1, &GPU_ASPECT_FONT);
 	GPU_delete_aspects(1, &GPU_ASPECT_BASIC);

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -1287,7 +1287,7 @@
 	BLI_unlock_thread(LOCK_OPENGL);
 }
 
-void GPU_free_image(Image *ima)
+void GPU_free_image(struct Image *ima)
 {
 	if (!BLI_thread_is_main()) {
 		gpu_queue_image_for_free(ima);

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -450,14 +450,14 @@
 }
 
 
-void gpu_immediate_gl_init(void)
+void gpu_immediate_init(void)
 {
 	quad_elements_init();
 }
 
 
 
-void gpu_immediate_gl_exit(void)
+void gpu_immediate_exit(void)
 {
 	quad_elements_exit();
 }

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -68,14 +68,14 @@
 
 
 
-void gpu_pixels_shader_init(void)
+void gpu_pixels_init(void)
 {
 	PIXELS_SHADER = NULL;
 }
 
 
 
-void gpu_pixels_shader_exit(void)
+void gpu_pixels_exit(void)
 {
 	GPU_shader_free(PIXELS_SHADER);
 }
@@ -382,7 +382,7 @@
 
 
 
-void gpu_pixels_shader_bind(void)
+void gpu_pixels_bind(void)
 {
 	bool glsl_support = GPU_glsl_support();
 
@@ -399,7 +399,7 @@
 
 
 
-void gpu_pixels_shader_unbind(void)
+void gpu_pixels_unbind(void)
 {
 	bool glsl_support = GPU_glsl_support();
 

Modified: branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c	2013-09-20 18:02:13 UTC (rev 60268)
+++ branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c	2013-09-20 18:11:44 UTC (rev 60269)
@@ -57,8 +57,9 @@
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
 
+#include "GPU_draw.h"
+#include "GPU_state_latch.h"
 #include "GPU_utility.h"
-#include "GPU_state_latch.h"
 
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"