[Scummvm-git-logs] scummvm master -> 31e3132896bd4f018ff6ff18a6a701982357a504

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
31e3132896 TINYGL: Reduced some forced inlines


Commit: 31e3132896bd4f018ff6ff18a6a701982357a504
    https://github.com/scummvm/scummvm/commit/31e3132896bd4f018ff6ff18a6a701982357a504
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-17T01:10:54+02:00

Commit Message:
TINYGL: Reduced some forced inlines

Changed paths:
    graphics/tinygl/zbuffer.h
    graphics/tinygl/ztriangle.cpp


diff --git a/graphics/tinygl/zbuffer.h b/graphics/tinygl/zbuffer.h
index c207dca9fc8..1dca8acc13a 100644
--- a/graphics/tinygl/zbuffer.h
+++ b/graphics/tinygl/zbuffer.h
@@ -308,21 +308,21 @@ private:
 	}
 
 	template <bool kDepthWrite, bool kSmoothMode, bool kFogMode, bool kEnableAlphaTest, bool kEnableScissor, bool kEnableBlending, bool kStencilEnabled, bool kDepthTestEnabled>
-	FORCEINLINE void putPixelNoTexture(int fbOffset, uint *pz, byte *ps, int _a,
-	                                   int x, int y, uint &z, uint &r, uint &g, uint &b, uint &a,
-	                                   int &dzdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
-	                                   uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx);
+	void putPixelNoTexture(int fbOffset, uint *pz, byte *ps, int _a,
+	                       int x, int y, uint &z, uint &r, uint &g, uint &b, uint &a,
+	                       int &dzdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
+	                       uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx);
 
 	template <bool kDepthWrite, bool kLightsMode, bool kSmoothMode, bool kFogMode, bool kEnableAlphaTest, bool kEnableScissor, bool kEnableBlending, bool kStencilEnabled, bool kDepthTestEnabled>
-	FORCEINLINE void putPixelTexture(int fbOffset, const TexelBuffer *texture,
-	                                 uint wrap_s, uint wrap_t, uint *pz, byte *ps, int _a,
-	                                 int x, int y, uint &z, int &t, int &s,
-	                                 uint &r, uint &g, uint &b, uint &a,
-	                                 int &dzdx, int &dsdx, int &dtdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
-	                                 uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx);
+	void putPixelTexture(int fbOffset, const TexelBuffer *texture,
+	                     uint wrap_s, uint wrap_t, uint *pz, byte *ps, int _a,
+	                     int x, int y, uint &z, int &t, int &s,
+	                     uint &r, uint &g, uint &b, uint &a,
+	                     int &dzdx, int &dsdx, int &dtdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
+	                     uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx);
 
 	template <bool kDepthWrite, bool kEnableScissor, bool kStencilEnabled, bool kDepthTestEnabled>
-	FORCEINLINE void putPixelDepth(uint *pz, byte *ps, int _a, int x, int y, uint &z, int &dzdx);
+	void putPixelDepth(uint *pz, byte *ps, int _a, int x, int y, uint &z, int &dzdx);
 
 
 	template <bool kEnableAlphaTest>
diff --git a/graphics/tinygl/ztriangle.cpp b/graphics/tinygl/ztriangle.cpp
index bd3d3382d90..0bf269e72b6 100644
--- a/graphics/tinygl/ztriangle.cpp
+++ b/graphics/tinygl/ztriangle.cpp
@@ -35,10 +35,10 @@ namespace TinyGL {
 static const int NB_INTERP = 8;
 
 template <bool kDepthWrite, bool kSmoothMode, bool kFogMode, bool kEnableAlphaTest, bool kEnableScissor, bool kEnableBlending, bool kStencilEnabled, bool kDepthTestEnabled>
-FORCEINLINE void FrameBuffer::putPixelNoTexture(int fbOffset, uint *pz, byte *ps, int _a,
-                                                int x, int y, uint &z, uint &r, uint &g, uint &b, uint &a,
-                                                int &dzdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
-                                                uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx) {
+void FrameBuffer::putPixelNoTexture(int fbOffset, uint *pz, byte *ps, int _a,
+                                    int x, int y, uint &z, uint &r, uint &g, uint &b, uint &a,
+                                    int &dzdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
+                                    uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx) {
 	if (kEnableScissor && scissorPixel(x + _a, y)) {
 		return;
 	}
@@ -76,12 +76,12 @@ FORCEINLINE void FrameBuffer::putPixelNoTexture(int fbOffset, uint *pz, byte *ps
 }
 
 template <bool kDepthWrite, bool kLightsMode, bool kSmoothMode, bool kFogMode, bool kEnableAlphaTest, bool kEnableScissor, bool kEnableBlending, bool kStencilEnabled, bool kDepthTestEnabled>
-FORCEINLINE void FrameBuffer::putPixelTexture(int fbOffset, const TexelBuffer *texture,
-                                              uint wrap_s, uint wrap_t, uint *pz, byte *ps, int _a,
-                                              int x, int y, uint &z, int &t, int &s,
-                                              uint &r, uint &g, uint &b, uint &a,
-                                              int &dzdx, int &dsdx, int &dtdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
-                                              uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx) {
+void FrameBuffer::putPixelTexture(int fbOffset, const TexelBuffer *texture,
+                                  uint wrap_s, uint wrap_t, uint *pz, byte *ps, int _a,
+                                  int x, int y, uint &z, int &t, int &s,
+                                  uint &r, uint &g, uint &b, uint &a,
+                                  int &dzdx, int &dsdx, int &dtdx, int &drdx, int &dgdx, int &dbdx, uint dadx,
+                                  uint &fog, int fog_r, int fog_g, int fog_b, int &dfdx) {
 	if (kEnableScissor && scissorPixel(x + _a, y)) {
 		return;
 	}
@@ -131,7 +131,7 @@ FORCEINLINE void FrameBuffer::putPixelTexture(int fbOffset, const TexelBuffer *t
 }
 
 template <bool kDepthWrite, bool kEnableScissor, bool kStencilEnabled, bool kDepthTestEnabled>
-FORCEINLINE void FrameBuffer::putPixelDepth(uint *pz, byte *ps, int _a, int x, int y, uint &z, int &dzdx) {
+void FrameBuffer::putPixelDepth(uint *pz, byte *ps, int _a, int x, int y, uint &z, int &dzdx) {
 	if (kEnableScissor && scissorPixel(x + _a, y)) {
 		return;
 	}