diff options
Diffstat (limited to 'canvas/source/opengl')
-rw-r--r-- | canvas/source/opengl/ogl_buffercontext.hxx | 4 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritecanvas.cxx | 4 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritecanvas.hxx | 2 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 6 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_textlayout.cxx | 4 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_textlayout.hxx | 2 |
6 files changed, 9 insertions, 13 deletions
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index 7f2066a0e075..717adb1d6f56 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -22,10 +22,10 @@ namespace oglcanvas virtual ~IBufferContext() {} /// start render to buffer. changes current framebuffer - virtual bool startBufferRendering() = 0; + virtual void startBufferRendering() = 0; /// end render to buffer. switches to default framebuffer - virtual bool endBufferRendering() = 0; + virtual void endBufferRendering() = 0; virtual GLuint getTextureId() = 0; }; diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 3f913fd64ab4..dfa6134a4dbe 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -154,9 +154,9 @@ namespace oglcanvas maDeviceHelper.hide(xSprite); } - bool SpriteCanvas::renderRecordedActions() const + void SpriteCanvas::renderRecordedActions() const { - return maCanvasHelper.renderRecordedActions(); + maCanvasHelper.renderRecordedActions(); } static uno::Reference<uno::XInterface> initCanvas( SpriteCanvas* pCanvas ) diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 66c3383bc1da..2ab985143dc8 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -103,7 +103,7 @@ namespace oglcanvas /** Write out recorded actions */ - bool renderRecordedActions() const; + void renderRecordedActions() const; private: css::uno::Sequence< css::uno::Any > maArguments; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 3043deeaec3f..bab170e37d24 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -520,16 +520,14 @@ namespace oglcanvas GLuint mnDepthId; GLuint mnTextureId; - virtual bool startBufferRendering() override + virtual void startBufferRendering() override { glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId); - return true; } - virtual bool endBufferRendering() override + virtual void endBufferRendering() override { glBindFramebuffer(GL_FRAMEBUFFER, 0); - return true; } virtual GLuint getTextureId() override diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index 5857367938e5..1f966d16a9cf 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -176,13 +176,11 @@ namespace oglcanvas return maText; } - bool TextLayout::draw( const rendering::ViewState& /*rViewState*/, + void TextLayout::draw( const rendering::ViewState& /*rViewState*/, const rendering::RenderState& /*rRenderState*/, const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/ ) const { // TODO - - return true; } } diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index c98cdcf5d465..e9c04e1635ea 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -61,7 +61,7 @@ namespace oglcanvas virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; virtual css::rendering::StringContext SAL_CALL getText( ) override; - bool draw( const css::rendering::ViewState& rViewState, + void draw( const css::rendering::ViewState& rViewState, const css::rendering::RenderState& rRenderState, const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice ) const; |