From a515e4d690b38ead781e0024ff9ec7b9dc00454b Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 15 Mar 2013 10:14:16 +0000 Subject: [PATCH] gpu: rename FrameBuffer to Framebuffer. --- neercs/video/render.cpp | 22 +++++++++++----------- neercs/video/render.h | 4 ++-- neercs/video/text-render.cpp | 2 +- neercs/video/text-render.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/neercs/video/render.cpp b/neercs/video/render.cpp index 62ef2d0..a0d17ef 100644 --- a/neercs/video/render.cpp +++ b/neercs/video/render.cpp @@ -841,9 +841,9 @@ ShaderUniform shader_radial_texture, shader_radial_screen_size, shader_radial_radial; -FrameBuffer *fbo_back, *fbo_front, *fbo_screen; -FrameBuffer *fbo_blur_h, *fbo_blur_v; -FrameBuffer *fbo_tmp, *fbo_buffer; +Framebuffer *fbo_back, *fbo_front, *fbo_screen; +Framebuffer *fbo_blur_h, *fbo_blur_v; +Framebuffer *fbo_tmp, *fbo_buffer; void Render::TraceQuad() { @@ -851,7 +851,7 @@ void Render::TraceQuad() glDrawArrays(GL_QUADS, 0, 4); } -void Render::ShaderSimple(FrameBuffer *fbo_output, int n) +void Render::ShaderSimple(Framebuffer *fbo_output, int n) { shader_simple->Bind(); shader_simple->SetUniform(shader_simple_texture, fbo_output->GetTexture(), n); @@ -865,13 +865,13 @@ int Render::InitDraw(void) glEnable(GL_CULL_FACE); // disable cull face glCullFace(GL_BACK); // don't draw front face /* initialise framebuffer objects */ - fbo_back = new FrameBuffer(screen_size); - fbo_screen = new FrameBuffer(screen_size); - fbo_front = new FrameBuffer(screen_size); - fbo_buffer = new FrameBuffer(screen_size); - fbo_blur_h = new FrameBuffer(screen_size); - fbo_blur_v = new FrameBuffer(screen_size); - fbo_tmp = new FrameBuffer(screen_size); + fbo_back = new Framebuffer(screen_size); + fbo_screen = new Framebuffer(screen_size); + fbo_front = new Framebuffer(screen_size); + fbo_buffer = new Framebuffer(screen_size); + fbo_blur_h = new Framebuffer(screen_size); + fbo_blur_v = new Framebuffer(screen_size); + fbo_tmp = new Framebuffer(screen_size); // shader simple shader_simple = Shader::Create(LOLFX_RESOURCE_NAME(simple)); shader_simple_texture = shader_simple->GetUniformLocation("texture"); diff --git a/neercs/video/render.h b/neercs/video/render.h index acdaf4e..0bcb2fc 100644 --- a/neercs/video/render.h +++ b/neercs/video/render.h @@ -23,7 +23,7 @@ protected: private: int CreateGLWindow(); int InitDraw(); - void ShaderSimple(FrameBuffer *fbo_output, int n); + void ShaderSimple(Framebuffer *fbo_output, int n); void TraceQuad(); void Pause(); void Shader(); @@ -50,4 +50,4 @@ private: bool m_shader_radial; }; -#endif // __VIDEO_RENDER_H__ \ No newline at end of file +#endif // __VIDEO_RENDER_H__ diff --git a/neercs/video/text-render.cpp b/neercs/video/text-render.cpp index 9e66d7e..565737c 100644 --- a/neercs/video/text-render.cpp +++ b/neercs/video/text-render.cpp @@ -87,7 +87,7 @@ void TextRender::CreateBuffers() m_vbo3->Unlock(); #endif - m_fbo = new FrameBuffer(m_fbo_size); + m_fbo = new Framebuffer(m_fbo_size); } void TextRender::Render() diff --git a/neercs/video/text-render.h b/neercs/video/text-render.h index 7e43fe5..ee37433 100644 --- a/neercs/video/text-render.h +++ b/neercs/video/text-render.h @@ -28,7 +28,7 @@ private: VertexDeclaration *m_vdecl; VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3; - FrameBuffer *m_fbo; + Framebuffer *m_fbo; }; #endif // __TEXT_RENDER_H__