diff options
| -rw-r--r-- | src/render/graphics.h | 2 | ||||
| -rw-r--r-- | src/render/graphicsdef.hpp | 2 | ||||
| -rw-r--r-- | src/render/imagegraphics.h | 2 | ||||
| -rw-r--r-- | src/render/mobileopengl2graphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/mobileopenglgraphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/modernopenglgraphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/normalopenglgraphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/nullopenglgraphics.cpp | 2 | ||||
| -rw-r--r-- | src/render/sdlgraphics.cpp | 3 | ||||
| -rw-r--r-- | src/render/surfacegraphics.h | 2 |
10 files changed, 4 insertions, 17 deletions
diff --git a/src/render/graphics.h b/src/render/graphics.h index 012f423f3..4e28a34dc 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -236,7 +236,7 @@ class Graphics notfinal const int x, const int y, const int w, const int h, const ImageRect &restrict imgRect) - restrict2 = 0; + restrict2 A_NONNULL(2) = 0; virtual void fillRectangle(const Rect &restrict rectangle) restrict2 = 0; diff --git a/src/render/graphicsdef.hpp b/src/render/graphicsdef.hpp index 11aec9e1e..7e2b349e2 100644 --- a/src/render/graphicsdef.hpp +++ b/src/render/graphicsdef.hpp @@ -92,7 +92,7 @@ public: const int x, const int y, const int w, const int h, const ImageRect &restrict imgRect) - restrict2 override final; + restrict2 override final A_NONNULL(2); void drawRectangle(const Rect &restrict rect) restrict2 override final; diff --git a/src/render/imagegraphics.h b/src/render/imagegraphics.h index 8db6cd8c6..8d4a72368 100644 --- a/src/render/imagegraphics.h +++ b/src/render/imagegraphics.h @@ -146,7 +146,7 @@ class ImegeGraphics final : public Graphics const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, const int h A_UNUSED, const ImageRect &restrict imgRect A_UNUSED) - restrict2 override final + restrict2 override final A_NONNULL(2) { } void fillRectangle(const Rect &rect A_UNUSED) override final diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 03810447a..65ed66a76 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -830,8 +830,6 @@ void MobileOpenGL2Graphics::calcWindow(ImageCollection *restrict const vertCol, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index df52adfe0..20d8f3661 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -870,8 +870,6 @@ void MobileOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 3a16c14a4..9c6da180d 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -817,8 +817,6 @@ void ModernOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; ImageVertexes *vert = nullptr; const Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index fdfa4fece..9aaa2aa47 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -1192,8 +1192,6 @@ void NormalOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index a2f93f588..51abe9183 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -921,8 +921,6 @@ void NullOpenGLGraphics::calcWindow(ImageCollection *restrict const vertCol, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index f8ed1a38d..8b7711a5c 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -790,9 +790,6 @@ void SDLGraphics::calcWindow(ImageCollection *restrict const vertCol, const int w, const int h, const ImageRect &restrict imgRect) restrict2 { - if (!vertCol) - return; - ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; if (!image) diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h index d57e1676a..0706dfc65 100644 --- a/src/render/surfacegraphics.h +++ b/src/render/surfacegraphics.h @@ -149,7 +149,7 @@ class SurfaceGraphics final : public Graphics const int x A_UNUSED, const int y A_UNUSED, const int w A_UNUSED, const int h A_UNUSED, const ImageRect &restrict imgRect A_UNUSED) - restrict2 override final + restrict2 override final A_NONNULL(2) { } void setBlitMode(const BlitModeT mode) restrict2 noexcept |