[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53309] branches/ge_harmony/source/ gameengine/Rasterizer/RAS_OpenGLRasterizer: Some more cleanup and style changes.

[Daniel Stokes]

Revision: 53309
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53309
Author:   kupoman
Date:     2012-12-24 08:34:03 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
Some more cleanup and style changes.

Modified Paths:
--------------
    
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
    
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
===================================================================
--- 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
      2012-12-24 08:17:47 UTC (rev 53308)
+++ 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
      2012-12-24 08:34:03 UTC (rev 53309)
@@ -74,8 +74,8 @@
 int INTERN_TEXTURE_COUNT = 3;
 
 RAS_OGLFilterManager::RAS_OGLFilterManager(RAS_OpenGLRasterizer *rast):
-m_rasterizer(rast),
 texturewidth(-1), textureheight(-1),
+m_rasterizer(rast),
 /* numberoffilters(0), */ /* UNUSED */ need_tex_update(true)
 {
        isshadersupported = GLEW_ARB_shader_objects &&
@@ -207,7 +207,6 @@
        FilterUniform uniform;
        texflag[passindex] = 0;
        uniform.type = RAS_BUILTIN;
-       unsigned int bind;
        int i;
 
        for (i = 0; i < sizeof(BGL_TEXTURE_NAMES) / sizeof(STR_String); i++) {
@@ -468,11 +467,11 @@
 void RAS_OGLFilterManager::RenderFilters(RAS_ICanvas* canvas)
 {
        RAS_OpenGLRasterizer *rast = m_rasterizer;
+       int num_filters = 0;
+       int buffer_toggle = 0;
        bool need_depth=false;
        bool need_luminance=false;
-       int num_filters = 0;
        bool first_filter = true;
-       char buffer_toggle = 0;
 
        int passindex;
 

Modified: 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
      2012-12-24 08:17:47 UTC (rev 53308)
+++ 
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
      2012-12-24 08:34:03 UTC (rev 53309)
@@ -1297,7 +1297,7 @@
        return new RAS_OGLFilterManager(this);
 }
 
-void SetShaderInternal(GPUShader **current, GPUShader *base, Shader** shaders, 
int count)
+static void set_shader_internal(GPUShader **current, GPUShader *base, Shader** 
shaders, int count)
 {
        if (*current != base)
                GPU_shader_free(*current);
@@ -1325,12 +1325,12 @@
 
 void RAS_OpenGLRasterizer::SetLightShader(Shader** shaders, int count)
 {
-       SetShaderInternal(&m_light_shader, m_light_shader_default, shaders, 
count);
+       set_shader_internal(&m_light_shader, m_light_shader_default, shaders, 
count);
 }
 
 void RAS_OpenGLRasterizer::SetPrePassShader(Shader** shaders, int count)
 {
-       SetShaderInternal(&m_prepass_shader, m_prepass_shader_default, shaders, 
count);
+       set_shader_internal(&m_prepass_shader, m_prepass_shader_default, 
shaders, count);
 }
 
 void RAS_OpenGLRasterizer::BeginLightPass()

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs