From 104df5cae8521f4a234381567b19e6b4da3ff1f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 25 Dec 2015 20:25:38 +0300 Subject: Add restrict keyword to all renderers. --- src/render/surfacegraphics.h | 99 ++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 45 deletions(-) (limited to 'src/render/surfacegraphics.h') diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h index 8f9bcba99..a2071941a 100644 --- a/src/render/surfacegraphics.h +++ b/src/render/surfacegraphics.h @@ -47,36 +47,37 @@ class SurfaceGraphics final : public Graphics ~SurfaceGraphics(); - void setTarget(SDL_Surface *const target) + void setTarget(SDL_Surface *restrict const target) restrict2 { mTarget = target; } - SDL_Surface *getTarget() const + SDL_Surface *getTarget() const restrict2 { return mTarget; } - void beginDraw() override final + void beginDraw() restrict2 override final { } - void endDraw() override final + void endDraw() restrict2 override final { } - void pushClipArea(const Rect &rect A_UNUSED) override final + void pushClipArea(const Rect &restrict rect A_UNUSED) + restrict2 override final { } void popClipArea() restrict2 override final { } - void drawRescaledImage(const Image *const image A_UNUSED, + void drawRescaledImage(const Image *restrict const image A_UNUSED, int dstX A_UNUSED, int dstY A_UNUSED, const int desiredWidth A_UNUSED, const int desiredHeight A_UNUSED) - override final + restrict2 override final { } - void drawPattern(const Image *const image A_UNUSED, + void drawPattern(const Image *restrict const image A_UNUSED, const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, - const int h A_UNUSED) override final + const int h A_UNUSED) restrict2 override final { } void drawRescaledPattern(const Image *const image A_UNUSED, @@ -89,43 +90,46 @@ class SurfaceGraphics final : public Graphics override final { } - void calcPattern(ImageVertexes *const vert A_UNUSED, - const Image *const image A_UNUSED, + void calcPattern(ImageVertexes *restrict const vert A_UNUSED, + const Image *restrict const image A_UNUSED, const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, - const int h A_UNUSED) const override final + const int h A_UNUSED) const restrict2 override final { } - void calcPattern(ImageCollection *const vert A_UNUSED, - const Image *const image A_UNUSED, + void calcPattern(ImageCollection *restrict const vert A_UNUSED, + const Image *restrict const image A_UNUSED, const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, - const int h A_UNUSED) const override final + const int h A_UNUSED) const restrict2 override final { } - void calcTileVertexes(ImageVertexes *const vert A_UNUSED, - const Image *const image A_UNUSED, + void calcTileVertexes(ImageVertexes *restrict const vert A_UNUSED, + const Image *restrict const image A_UNUSED, int x A_UNUSED, - int y A_UNUSED) const override final + int y A_UNUSED) const restrict2 override final { } - void calcTileSDL(ImageVertexes *const vert A_UNUSED, - int x A_UNUSED, int y A_UNUSED) const override final + void calcTileSDL(ImageVertexes *restrict const vert A_UNUSED, + int x A_UNUSED, + int y A_UNUSED) const restrict2 override final { } - void calcTileCollection(ImageCollection *const vertCol A_UNUSED, - const Image *const image A_UNUSED, - int x A_UNUSED, int y A_UNUSED) override final + void calcTileCollection(ImageCollection *restrict const vertCol A_UNUSED, + const Image *restrict const image A_UNUSED, + int x A_UNUSED, + int y A_UNUSED) restrict2 override final { } - void drawTileVertexes(const ImageVertexes *const - vert A_UNUSED) override final + void drawTileVertexes(const ImageVertexes *restrict const + vert A_UNUSED) restrict2 override final { } - void drawTileCollection(const ImageCollection *const vertCol A_UNUSED) - override final + void drawTileCollection(const ImageCollection *restrict const + vertCol A_UNUSED) + restrict2 override final { } void updateScreen() override final @@ -136,32 +140,36 @@ class SurfaceGraphics final : public Graphics const int x2 A_UNUSED, const int y2 A_UNUSED, const int width A_UNUSED, - const int height A_UNUSED) override final + const int height A_UNUSED) restrict2 override final { } - void calcWindow(ImageCollection *const vertCol A_UNUSED, + void calcWindow(ImageCollection *restrict const vertCol A_UNUSED, const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, const int h A_UNUSED, - const ImageRect &imgRect A_UNUSED) override final + const ImageRect &restrict imgRect A_UNUSED) + restrict2 override final { } - void setBlitMode(const BlitModeT mode) + void setBlitMode(const BlitModeT mode) restrict2 { mBlitMode = mode; } - BlitModeT getBlitMode() const A_WARN_UNUSED + BlitModeT getBlitMode() const restrict2 A_WARN_UNUSED { return mBlitMode; } - void fillRectangle(const Rect &rect A_UNUSED) override final + void fillRectangle(const Rect &restrict rect A_UNUSED) + restrict2 override final { } - void drawRectangle(const Rect &rect A_UNUSED) restrict2 override final + void drawRectangle(const Rect &restrict rect A_UNUSED) + restrict2 override final { } - void drawPoint(int x A_UNUSED, int y A_UNUSED) override final + void drawPoint(int x A_UNUSED, int y A_UNUSED) restrict2 override final { } void drawLine(int x1 A_UNUSED, int y1 A_UNUSED, - int x2 A_UNUSED, int y2 A_UNUSED) override final + int x2 A_UNUSED, int y2 A_UNUSED) + restrict2 override final { } bool setVideoMode(const int w A_UNUSED, const int h A_UNUSED, @@ -172,23 +180,23 @@ class SurfaceGraphics final : public Graphics const bool noFrame A_UNUSED) restrict2 override final { return false; } - void drawImage(const Image *const image, - int dstX, int dstY) override final; + void drawImage(const Image *restrict const image, + int dstX, int dstY) restrict2 override final; - void copyImage(const Image *const image, + void copyImage(const Image *restrict const image, int dstX, int dstY) restrict2 override final; - void drawImageCached(const Image *const image, - int x, int y) override final; + void drawImageCached(const Image *restrict const image, + int x, int y) restrict2 override final; - void drawPatternCached(const Image *const image A_UNUSED, + void drawPatternCached(const Image *restrict const image A_UNUSED, const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, - const int h A_UNUSED) override final + const int h A_UNUSED) restrict2 override final { } - void completeCache() override final; + void completeCache() restrict2 override final; /** * Draws a rectangle using images. 4 corner images, 4 side images and 1 @@ -196,7 +204,8 @@ class SurfaceGraphics final : public Graphics */ void drawImageRect(const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, const int h A_UNUSED, - const ImageRect &imgRect A_UNUSED) override final + const ImageRect &restrict imgRect A_UNUSED) + restrict2 override final { } protected: -- cgit v1.2.3-60-g2f50