glthread: simplify printing safe_mul in gl_marshal.py

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index 6403b75bbc6981d48349ad6d9106d513f3234956..d4bbcd44a489411970257d57292e128ca8718b58 100644 (file)
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -37,6 +37,14 @@ header = """
 #include "marshal.h"
 
 #define COMPAT (ctx->API != API_OPENGL_CORE)
 #include "marshal.h"
 
 #define COMPAT (ctx->API != API_OPENGL_CORE)

+
+static inline int safe_mul(int a, int b)
+{
+    if (a < 0 || b < 0) return -1;
+    if (a == 0 || b == 0) return 0;
+    if (a > INT_MAX / b) return -1;
+    return a * b;
+}

 """
 
 
 """
 
 


@@ -68,14 +76,6 @@ class PrintCode(gl_XML.gl_print_base):
 
     def printRealHeader(self):
         print(header)
 
     def printRealHeader(self):
         print(header)

-        print('static inline int safe_mul(int a, int b)')
-        print('{')
-        print('    if (a < 0 || b < 0) return -1;')
-        print('    if (a == 0 || b == 0) return 0;')
-        print('    if (a > INT_MAX / b) return -1;')
-        print('    return a * b;')
-        print('}')
-        print()

 
     def printRealFooter(self):
         pass
 
     def printRealFooter(self):
         pass