[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11248] branches/soc-2007-maike/source/ blender: Solving mac variable types issues (dunno if it works!)
Miguel Torres Lima
torreslima at gmail.com
Thu Jul 12 19:47:39 CEST 2007
Revision: 11248
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11248
Author: maike
Date: 2007-07-12 19:47:39 +0200 (Thu, 12 Jul 2007)
Log Message:
-----------
Solving mac variable types issues (dunno if it works!)
Modified Paths:
--------------
branches/soc-2007-maike/source/blender/include/BIF_glsl_drawobject.h
branches/soc-2007-maike/source/blender/include/BIF_glsl_program.h
branches/soc-2007-maike/source/blender/include/BIF_glsl_shader_util.h
branches/soc-2007-maike/source/blender/include/BIF_glsl_uniforms.h
branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h
branches/soc-2007-maike/source/blender/src/glsl_drawobject.c
branches/soc-2007-maike/source/blender/src/glsl_shader_util.c
Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_drawobject.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_drawobject.h 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_drawobject.h 2007-07-12 17:47:39 UTC (rev 11248)
@@ -17,17 +17,30 @@
/* ----------------------------------------------------------------------------- */
+#ifdef __APPLE__
+void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_area_lamp_vectors(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned long program);
+void glsl_light_uniforms(unsigned long program, struct Object *obj);
+void set_vertex_color(struct Material *mat, struct MCol *mcol, int n, unsigned long program);
+#else
void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
void glsl_runtime_lamp_uniforms(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
void glsl_area_lamp_vectors(struct Lamp *lamp, struct Object *obj, struct Object *lamp_obj, int num, unsigned int program);
+void glsl_light_uniforms(unsigned int program, struct Object *obj);
+void set_vertex_color(struct Material *mat, struct MCol *mcol, int n, unsigned int program);
+#endif
-void glsl_light_uniforms(unsigned int program, struct Object *obj);
+
void create_vertex(struct Object *obj, struct MVert *vert, int index, int flag);
void glsl_draw(struct Base *base);
-void set_vertex_color(struct Material *mat, struct MCol *mcol, int n, unsigned int program);
+
void glsl_set_outline_colors(void);
void glsl_draw_outline(struct Base *base, struct MFace *face, int num, struct MVert *vert);
void glsl_draw_mesh_selected_outline(struct MFace *face, int num, struct MVert *vert);
Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_program.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_program.h 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_program.h 2007-07-12 17:47:39 UTC (rev 11248)
@@ -29,13 +29,25 @@
struct GLSL_Program_
{
+
+#ifdef __APPLE__
+ unsigned long program; /* handler return by glCreateProgram() */
+ unsigned long vertex_shader; /* pointer array to vertex shaders' handlers */
+ unsigned long fragment_shader; /* pointer array to fragment shaders' handlers */
+#else
unsigned int program; /* handler return by glCreateProgram() */
unsigned int vertex_shader; /* pointer array to vertex shaders' handlers */
unsigned int fragment_shader; /* pointer array to fragment shaders' handlers */
+#endif
struct GLSL_Program_ *next;
+#ifdef __APPLE__
+ int (*link)(unsigned long program);
+#else
int (*link)(unsigned int program);
+#endif
+
void (*free)(struct GLSL_Program_ *program);
};
Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_shader_util.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_shader_util.h 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_shader_util.h 2007-07-12 17:47:39 UTC (rev 11248)
@@ -1,8 +1,16 @@
-
+#ifdef __APPLE__
+void glsl_free_GLshader(unsigned long program, unsigned long shader);
+unsigned long glsl_create_GLprogram(void);
+unsigned long glsl_create_GLshader(char *code, int type, int str_num);
+void glsl_delete_GLprogram(unsigned long program);
+void glsl_attach_GLshader(unsigned long program, unsigned long shader);
+void print_GLlog(unsigned long prog, short type);
+#else
void glsl_free_GLshader(unsigned int program, unsigned int shader);
-GLuint glsl_create_GLprogram(void);
-GLuint glsl_create_GLshader(char *code, int type, int str_num);
+unsigned int glsl_create_GLprogram(void);
+unsigned int glsl_create_GLshader(char *code, int type, int str_num);
void glsl_delete_GLprogram(unsigned int program);
void glsl_attach_GLshader(unsigned int program, unsigned int shader);
void print_GLlog(unsigned int prog, short type);
+#endif
Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_uniforms.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_uniforms.h 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_uniforms.h 2007-07-12 17:47:39 UTC (rev 11248)
@@ -10,10 +10,19 @@
void glsl_update_tree_material_uniforms(struct GLSL_MaterialTree_ *tree);
void glsl_update_material_material_uniforms(struct Material *mat, struct GLSL_Program_ *program, int index);
void glsl_update_mat_material_uniforms(struct Material *mat);
+
+#ifdef __APPLE__
+void glsl_update_material_uniforms(unsigned long program, struct Material *mat, int index);
+#else
void glsl_update_material_uniforms(unsigned int program, struct Material *mat, int index);
+#endif
-
void glsl_update_all_world_uniforms(void);
void glsl_update_tree_world_uniforms(struct GLSL_MaterialTree_ *tree);
void glsl_update_material_world_uniforms(struct Material *mat);
+
+#ifdef __APPLE__
+void glsl_update_world_uniforms(unsigned long program);
+#else
void glsl_update_world_uniforms(unsigned int program);
+#endif
Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h 2007-07-12 17:47:39 UTC (rev 11248)
@@ -23,5 +23,8 @@
char *read_shader_file(char *name);
void glsl_error(int type, char *text, char *msg);
+#ifdef __APPLE__
+int glsl_uniform_location(unsigned long program, char *name);
+#else
int glsl_uniform_location(unsigned int program, char *name);
-
+#endif
Modified: branches/soc-2007-maike/source/blender/src/glsl_drawobject.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_drawobject.c 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/src/glsl_drawobject.c 2007-07-12 17:47:39 UTC (rev 11248)
@@ -42,7 +42,6 @@
#include "MTC_matrixops.h"
extern struct Material defmaterial;
-extern GLSL_MaterialTree glsl_defmaterial;
static float active_color[4] = { -1, -1, -1 };
static float selected_color[4] = { -1, -1, -1 };
@@ -336,7 +335,7 @@
float *nors = dm->getFaceDataArray(dm, CD_NORMAL);
int i;
Material *oldmat = NULL;
- GLSL_Program program = NULL;//glsl_get_material_program(&defmaterial, GLSL_SHADED);
+ GLSL_Program program = NULL;
glMatrixMode(GL_MODELVIEW);
@@ -428,7 +427,7 @@
}
-void set_vertex_color(Material *mat, MCol *mcol, int n, unsigned int program)
+void set_vertex_color(Material *mat, MCol *mcol, int n, GLuint program)
{
if(mat && mcol){
unsigned char *col = (unsigned char *) mcol;
Modified: branches/soc-2007-maike/source/blender/src/glsl_shader_util.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_shader_util.c 2007-07-12 17:36:53 UTC (rev 11247)
+++ branches/soc-2007-maike/source/blender/src/glsl_shader_util.c 2007-07-12 17:47:39 UTC (rev 11248)
@@ -23,7 +23,7 @@
}
-void glsl_delete_GLprogram(unsigned int program)
+void glsl_delete_GLprogram(GLuint program)
{
glDeleteProgram(program);
}
@@ -59,13 +59,13 @@
}
-void glsl_attach_GLshader(unsigned int program, unsigned int shader)
+void glsl_attach_GLshader(GLuint program, GLuint shader)
{
glAttachShader(program, shader);
}
-void print_GLlog(unsigned int prog, short type)
+void print_GLlog(GLuint prog, short type)
{
GLint p = 0;
int c = 0;
More information about the Bf-blender-cvs
mailing list