[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57540] branches/ge_harmony/source: Cleaning up some various GCC warnings.
Mitchell Stokes
mogurijin at gmail.com
Tue Jun 18 09:43:06 CEST 2013
Revision: 57540
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57540
Author: moguri
Date: 2013-06-18 07:43:05 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Cleaning up some various GCC warnings.
Modified Paths:
--------------
branches/ge_harmony/source/blender/blenkernel/BKE_shader.h
branches/ge_harmony/source/blender/blenkernel/intern/shader.c
branches/ge_harmony/source/blender/gpu/GPU_extensions.h
branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
Modified: branches/ge_harmony/source/blender/blenkernel/BKE_shader.h
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/BKE_shader.h 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/blenkernel/BKE_shader.h 2013-06-18 07:43:05 UTC (rev 57540)
@@ -38,13 +38,15 @@
#include "DNA_shader_types.h"
+struct Main;
+
void init_shader(struct Shader *sh);
void BKE_shader_free(Shader *sh);
void BKE_shader_lib_free(Shader *sh);
struct Shader *BKE_shader_add(const char *name);
struct Shader *BKE_shader_copy(struct Shader *sh);
-struct Shader *BKE_shader_empty();
+struct Shader *BKE_shader_empty(void);
void BKE_shader_source_merge(Shader *dst, const Shader *src);
void BKE_shader_source_merge_ch(Shader *dst, const char *src);
Modified: branches/ge_harmony/source/blender/blenkernel/intern/shader.c
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/intern/shader.c 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/blenkernel/intern/shader.c 2013-06-18 07:43:05 UTC (rev 57540)
@@ -99,7 +99,7 @@
return shn;
}
-struct Shader *BKE_shader_empty()
+struct Shader *BKE_shader_empty(void)
{
Shader *sh;
sh = MEM_mallocN(sizeof(Shader), "Empty Shader");
@@ -149,7 +149,7 @@
sprintf(count, "%d", i++);
strcpy(fname1, "main");
strcat(fname1, count);
- }while (search = strstr(dst->source, fname1));
+ }while ((search = strstr(dst->source, fname1)));
search = BLI_dynstr_get_cstring(new_source);
/* Add the first main back in with new name */
@@ -161,7 +161,7 @@
sprintf(count, "%d", i++);
strcpy(fname2, "main");
strcat(fname2, count);
- }while (search = strstr(dst->source, fname2));
+ }while ((search = strstr(dst->source, fname2)));
/* Add the second main back in with new name */
while (*(src_main++) != '(');
@@ -190,7 +190,7 @@
BKE_shader_free(sh);
}
-int starts_with(const char *str, const char *start)
+static int starts_with(const char *str, const char *start)
{
int len, result;
char *tmp;
@@ -202,7 +202,7 @@
return result == 0;
}
-Uniform *uniform_init(char *type, char *name)
+static Uniform *uniform_init(char *type, char *name)
{
Uniform *uni = MEM_mallocN(sizeof(Uniform), "Custom shader uniform");
int data_size;
@@ -279,7 +279,7 @@
return uni;
}
-char *file_to_buf(char *filename, Main *main)
+static char *file_to_buf(char *filename, Main *main)
{
FILE *fp;
int len;
@@ -321,7 +321,7 @@
return shader;
}
-char* extract_token(char **ptr)
+static char* extract_token(char **ptr)
{
char *token;
int token_len = 0;
@@ -339,9 +339,8 @@
return token;
}
-void extract_default(const char *src, Uniform *uni)
+static void extract_default(const char *src, Uniform *uni)
{
- void *var = NULL;
int error = 0;
/* Ignore whitespace */
@@ -349,27 +348,27 @@
src++;
if (uni->type == SHADER_UNF_FLOAT) {
- if (sscanf(src, "%f", &uni->data) != 1)
+ if (sscanf(src, "%f", (float*)&uni->data) != 1)
error = 1;
}
else if (uni->type == SHADER_UNF_VEC2) {
- if (sscanf(src, "vec2(%f, %f)", uni->data, (float*)uni->data+1) != 2)
+ if (sscanf(src, "vec2(%f, %f)", (float*)uni->data, (float*)uni->data+1) != 2)
error = 1;
}
else if (uni->type == SHADER_UNF_VEC3) {
- if (sscanf(src, "vec3(%f, %f, %f)", uni->data, (float*)uni->data+1, (float*)uni->data+2) != 3)
+ if (sscanf(src, "vec3(%f, %f, %f)", (float*)uni->data, (float*)uni->data+1, (float*)uni->data+2) != 3)
error = 1;
}
else if (uni->type == SHADER_UNF_INT) {
- if (sscanf(src, "%d", &uni->data) != 1)
+ if (sscanf(src, "%d", (int*)&uni->data) != 1)
error = 1;
}
else if (uni->type == SHADER_UNF_IVEC2) {
- if (sscanf(src, "vec2(%d, %d)", uni->data, (int*)uni->data+1) != 2)
+ if (sscanf(src, "vec2(%d, %d)", (int*)uni->data, (int*)uni->data+1) != 2)
error = 1;
}
else if (uni->type == SHADER_UNF_IVEC3) {
- if (sscanf(src, "vec3(%d, %d, %d)", uni->data, (int*)uni->data+1, (int*)uni->data+2) != 3)
+ if (sscanf(src, "vec3(%d, %d, %d)", (int*)uni->data, (int*)uni->data+1, (int*)uni->data+2) != 3)
error = 1;
}
@@ -388,7 +387,7 @@
if (!src)
return;
- while (src = strstr(src, "uniform")) {
+ while ((src = strstr(src, "uniform"))) {
src += 7;
type = extract_token(&src);
name = extract_token(&src);
@@ -432,4 +431,4 @@
if (sh->source)
gather_uniforms(sh);
-}
\ No newline at end of file
+}
Modified: branches/ge_harmony/source/blender/gpu/GPU_extensions.h
===================================================================
--- branches/ge_harmony/source/blender/gpu/GPU_extensions.h 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/gpu/GPU_extensions.h 2013-06-18 07:43:05 UTC (rev 57540)
@@ -39,6 +39,7 @@
struct Image;
struct ImageUser;
struct PreviewImage;
+struct Material;
struct GPUTexture;
typedef struct GPUTexture GPUTexture;
@@ -194,7 +195,7 @@
GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader);
void GPU_shader_free_builtin_shaders(void);
-extern const char* GPU_get_libcode();
+const char* GPU_get_libcode(void);
/* Vertex attributes for shaders */
Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c 2013-06-18 07:43:05 UTC (rev 57540)
@@ -1348,32 +1348,6 @@
}
}
-char *load_shader(char *filename)
-{
- FILE *fp;
- int len;
- char *shader = NULL;
-
- fp = fopen(filename, "r");
-
- if (fp)
- {
- // Find the size
- fseek(fp, 0, SEEK_END);
- len = ftell(fp);
- rewind(fp);
-
- // Initialize the string and read the files
- shader = MEM_callocN(len, "shader_text");
- fread(shader, 1, len, fp);
-
- // Close the file
- fclose(fp);
- }
-
- return shader;
-}
-
GPUPass *GPU_generate_pass(ListBase *nodes, GPUNodeLink *outlink, GPUVertexAttribs *attribs, int *builtins, const char *name, ListBase *custom_shaders)
{
GPUShader *shader;
@@ -1484,7 +1458,7 @@
MEM_freeN(pass);
}
-const char* GPU_get_libcode()
+const char* GPU_get_libcode(void)
{
return glsl_material_library;
-}
\ No newline at end of file
+}
Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h 2013-06-18 07:43:05 UTC (rev 57540)
@@ -194,7 +194,5 @@
void gpu_material_add_node(struct GPUMaterial *material, struct GPUNode *node);
int GPU_link_changed(struct GPUNodeLink *link);
-const char *GPU_get_libcode();
-
#endif
Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_material.c 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_material.c 2013-06-18 07:43:05 UTC (rev 57540)
@@ -71,7 +71,7 @@
/* Supported RNA values for uniforms */
#define rna_floats_size 4
-char* rna_floats[rna_floats_size] = {
+const char* rna_floats[rna_floats_size] = {
"diffuse_color",
"specular_color",
"alpha",
Modified: branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2013-06-18 07:43:05 UTC (rev 57540)
@@ -53,8 +53,8 @@
mShader(0),
mBlenderShader(0),
mScene(NULL),
- mUserDefBlend(0),
mLightLayer(0),
+ mUserDefBlend(0),
mModified(0),
mConstructed(false),
mPass(0)
@@ -909,7 +909,7 @@
if (!PyType_IsSubtype(&KX_PythonShader::Type, Py_TYPE(value)))
{
PyErr_SetString(PyExc_TypeError, "expected a Shader object");
- return NULL;
+ return PY_SET_ATTR_FAIL;
}
KX_PythonShader *pyshader = static_cast<KX_PythonShader*>BGE_PROXY_REF(value);
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp 2013-06-18 06:23:30 UTC (rev 57539)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp 2013-06-18 07:43:05 UTC (rev 57540)
@@ -68,8 +68,8 @@
RAS_OGLFilterManager::RAS_OGLFilterManager(RAS_OpenGLRasterizer *rast):
texturewidth(-1), textureheight(-1),
-m_rasterizer(rast),
-/* numberoffilters(0), */ /* UNUSED */ need_tex_update(true)
+/* numberoffilters(0), */ /* UNUSED */ need_tex_update(true),
+ m_rasterizer(rast)
{
isshadersupported = GLEW_ARB_shader_objects &&
GLEW_ARB_fragment_shader && GLEW_ARB_multitexture;
@@ -281,7 +281,6 @@
slot++;
}
else if (uname.Find("DepthTexture") != -1) {
- int target = uname.Right(1).ToInt();
glActiveTextureARB(GL_TEXTURE0 + slot);
glBindTexture(GL_TEXTURE_2D, rast->GetDepthTarget());
glUniform1iARB(uniformLoc, slot);
More information about the Bf-blender-cvs
mailing list