ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warnings most likely caused by copying a frame buffer object

Browse Source 
(missing &), added several const to frame buffer references.
This commit is contained in:
hiker 2015-06-02 14:19:15 +10:00
parent a51d56a6e5
commit 1dabb39ed4
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/graphics/post_processing.cpp
View File

@ -98,7 +98,7 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void render(GLuint layer_tex, int width, int height, float sigma_v) void render(GLuint layer_tex, int width, int height, float sigma_v)
{ {
Gaussian6VBlurShader::getInstance()->setTextureUnits(layer_tex); setTextureUnits(layer_tex);
drawFullScreenEffect(core::vector2df(1.f / width, 1.f / height), drawFullScreenEffect(core::vector2df(1.f / width, 1.f / height),
sigma_v); sigma_v);
} // render } // render
@ -106,7 +106,7 @@ public:
// ============================================================================ // ============================================================================
class Gaussian3VBlurShader : public TextureShader<Gaussian3VBlurShader, 1, class Gaussian3VBlurShader : public TextureShader<Gaussian3VBlurShader, 1,
core::vector2df> core::vector2df>
{ {
public: public:
Gaussian3VBlurShader() Gaussian3VBlurShader()
@ -118,7 +118,7 @@ public:
assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED); assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
} // Gaussian3VBlurShader } // Gaussian3VBlurShader
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void render(FrameBuffer in_fbo, float inv_width, float inv_height) void render(const FrameBuffer &in_fbo, float inv_width, float inv_height)
{ {
setTextureUnits(in_fbo.getRTT()[0]); setTextureUnits(in_fbo.getRTT()[0]);
drawFullScreenEffect(core::vector2df(inv_width, inv_height)); drawFullScreenEffect(core::vector2df(inv_width, inv_height));
@ -394,7 +394,7 @@ public:
assignSamplerNames(0, "text", ST_NEAREST_FILTERED); assignSamplerNames(0, "text", ST_NEAREST_FILTERED);
} // ToneMapShader } // ToneMapShader
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void render(FrameBuffer &fbo, GLuint rtt, float vignette_weight) void render(const FrameBuffer &fbo, GLuint rtt, float vignette_weight)
{ {
fbo.bind(); fbo.bind();
setTextureUnits(rtt); setTextureUnits(rtt);
@ -1081,8 +1081,8 @@ static std::vector<float> getGaussianWeight(float sigma, size_t count)
} // getGaussianWeight } // getGaussianWeight
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, void PostProcessing::renderGaussian3Blur(const FrameBuffer &in_fbo,
FrameBuffer &auxiliary) const FrameBuffer &auxiliary)
{ {
assert(in_fbo.getWidth() == auxiliary.getWidth() && assert(in_fbo.getWidth() == auxiliary.getWidth() &&
in_fbo.getHeight() == auxiliary.getHeight()); in_fbo.getHeight() == auxiliary.getHeight());
@ -1161,8 +1161,8 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
} // renderGaussian6BlurLayer } // renderGaussian6BlurLayer
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, void PostProcessing::renderGaussian6Blur(const FrameBuffer &in_fbo,
FrameBuffer &auxiliary, float sigma_v, const FrameBuffer &auxiliary, float sigma_v,
float sigma_h) float sigma_h)
{ {
assert(in_fbo.getWidth() == auxiliary.getWidth() && assert(in_fbo.getWidth() == auxiliary.getWidth() &&
@ -1218,8 +1218,8 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
} // renderGaussian6Blur } // renderGaussian6Blur
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo, void PostProcessing::renderHorizontalBlur(const FrameBuffer &in_fbo,
FrameBuffer &auxiliary) const FrameBuffer &auxiliary)
{ {
assert(in_fbo.getWidth() == auxiliary.getWidth() && assert(in_fbo.getWidth() == auxiliary.getWidth() &&
in_fbo.getHeight() == auxiliary.getHeight()); in_fbo.getHeight() == auxiliary.getHeight());
@ -1236,8 +1236,8 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, void PostProcessing::renderGaussian17TapBlur(const FrameBuffer &in_fbo,
FrameBuffer &auxiliary) const FrameBuffer &auxiliary)
{ {
assert(in_fbo.getWidth() == auxiliary.getWidth() && assert(in_fbo.getWidth() == auxiliary.getWidth() &&
in_fbo.getHeight() == auxiliary.getHeight()); in_fbo.getHeight() == auxiliary.getHeight());
@ -1324,7 +1324,7 @@ void PostProcessing::renderSSAO()
} // renderSSAO } // renderSSAO
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, void PostProcessing::renderMotionBlur(unsigned , const FrameBuffer &in_fbo,
FrameBuffer &out_fbo) FrameBuffer &out_fbo)
{ {
MotionBlurProvider * const cb = MotionBlurProvider * const cb =

10
src/graphics/post_processing.hpp
View File

@ -88,22 +88,22 @@ public:
const core::vector3df &rh_extend, const core::vector3df &rh_extend,
const FrameBuffer &fb); const FrameBuffer &fb);
/** Blur the in texture */ /** Blur the in texture */
void renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary); void renderGaussian3Blur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
void renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary, void renderGaussian6Blur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary,
float sigmaV, float sigmaH); float sigmaV, float sigmaH);
void renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary); void renderHorizontalBlur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
void renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer, void renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
float sigmaH, float sigmaV); float sigmaH, float sigmaV);
void renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary); void renderGaussian17TapBlur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
/** Render tex. Used for blit/texture resize */ /** Render tex. Used for blit/texture resize */
void renderPassThrough(unsigned tex, unsigned width, unsigned height); void renderPassThrough(unsigned tex, unsigned width, unsigned height);
void renderTextureLayer(unsigned tex, unsigned layer); void renderTextureLayer(unsigned tex, unsigned layer);
void applyMLAA(); void applyMLAA();
void renderMotionBlur(unsigned cam, FrameBuffer &in_fbo, void renderMotionBlur(unsigned cam, const FrameBuffer &in_fbo,
FrameBuffer &out_fbo); FrameBuffer &out_fbo);
void renderGlow(unsigned tex); void renderGlow(unsigned tex);