Add compiler printf attribute to relevant functions

scripts/generate_entry_points.py

@@ -298,6 +298,34 @@ def just_the_name_packed(param, reserved_set):
     else:
         return name
 
+static_cast_to_dict = {
+    "GLintptr": "unsigned long long",
+    "GLsizeiptr": "unsigned long long",
+    "GLuint64": "unsigned long long",
+}
+
+reinterpret_cast_to_dict = {
+    "GLsync": "uintptr_t",
+    "GLDEBUGPROC": "uintptr_t",
+    "GLDEBUGPROCKHR": "uintptr_t",
+    "GLeglImageOES": "uintptr_t",
+}
+
+def param_print_argument(param):
+    name_only = just_the_name(param)
+    type_only = just_the_type(param)
+
+    if "*" in param:
+        return "reinterpret_cast<uintptr_t>(" + name_only + ")"
+
+    if type_only in reinterpret_cast_to_dict:
+        return "reinterpret_cast<" + reinterpret_cast_to_dict[type_only] + ">(" + name_only + ")"
+
+    if type_only in static_cast_to_dict:
+        return "static_cast<" + static_cast_to_dict[type_only] + ">(" + name_only + ")"
+
+    return name_only
+
 format_dict = {
     "GLbitfield": "0x%X",
     "GLboolean": "%u",
@@ -306,22 +334,22 @@ format_dict = {
     "GLfixed": "0x%X",
     "GLfloat": "%f",
     "GLint": "%d",
-    "GLintptr": "%d",
+    "GLintptr": "%llu",
     "GLshort": "%d",
     "GLsizei": "%d",
-    "GLsizeiptr": "%d",
-    "GLsync": "0x%0.8p",
+    "GLsizeiptr": "%llu",
+    "GLsync": "0x%016\" PRIxPTR \"",
     "GLubyte": "%d",
     "GLuint": "%u",
     "GLuint64": "%llu",
-    "GLDEBUGPROC": "0x%0.8p",
-    "GLDEBUGPROCKHR": "0x%0.8p",
-    "GLeglImageOES": "0x%0.8p",
+    "GLDEBUGPROC": "0x%016\" PRIxPTR \"",
+    "GLDEBUGPROCKHR": "0x%016\" PRIxPTR \"",
+    "GLeglImageOES": "0x%016\" PRIxPTR \"",
 }
 
 def param_format_string(param):
     if "*" in param:
-        return param + " = 0x%0.8p"
+        return param + " = 0x%016\" PRIxPTR \""
     else:
         type_only = just_the_type(param)
         if type_only not in format_dict:
@@ -358,7 +386,7 @@ def format_entry_point_def(cmd_name, proto, params, is_explicit_context):
             packed_gl_enum_conversions += ["\n        " + internal_type + " " + internal_name +" = FromGLenum<" +
                                           internal_type + ">(" + name + ");"]
 
-    pass_params = [just_the_name(param) for param in params]
+    pass_params = [param_print_argument(param) for param in params]
     format_params = [param_format_string(param) for param in params]
     return_type = proto[:-len(cmd_name)]
     default_return = default_return_value(cmd_name, return_type.strip())

src/common/angleutils.h

@@ -297,6 +297,16 @@ std::string ToString(const T &value)
 #define ANGLE_NOINLINE
 #endif
 
+#if defined(__clang__) || (defined(__GNUC__) && defined(__has_attribute))
+#if __has_attribute(format)
+#define ANGLE_FORMAT_PRINTF(fmt, args) __attribute__((format(__printf__, fmt, args)))
+#else
+#define ANGLE_FORMAT_PRINTF(fmt, args)
+#endif
+#else
+#define ANGLE_FORMAT_PRINTF(fmt, args)
+#endif
+
 #ifndef ANGLE_STRINGIFY
 #define ANGLE_STRINGIFY(x) #x
 #endif

src/common/debug.h

@@ -31,7 +31,8 @@ namespace gl
 class ScopedPerfEventHelper : angle::NonCopyable
 {
   public:
-    ScopedPerfEventHelper(const char* format, ...);
+    ANGLE_FORMAT_PRINTF(2, 3)
+    ScopedPerfEventHelper(const char *format, ...);
     ~ScopedPerfEventHelper();
 };
 

src/gpu_info_util/SystemInfo_android.cpp

@@ -97,6 +97,7 @@ class VulkanLibrary final : NonCopyable
     VkInstance mInstance = VK_NULL_HANDLE;
 };
 
+ANGLE_FORMAT_PRINTF(1, 2)
 std::string FormatString(const char *fmt, ...)
 {
     va_list vararg;

src/libANGLE/angletypes.h

@@ -17,6 +17,7 @@
 #include "libANGLE/Error.h"
 #include "libANGLE/RefCountObject.h"
 
+#include <inttypes.h>
 #include <stdint.h>
 
 #include <bitset>

src/tests/gles_conformance_tests/gles_conformance_tests.cpp

@@ -7,6 +7,7 @@
 #include <sstream>
 #include <stdarg.h>
 
+ANGLE_FORMAT_PRINTF(1, 2)
 static std::vector<char> FormatArg(const char* fmt, ...)
 {
     va_list vararg;