From cae02d31f1b15b139af822aa7559c5157780dbbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Wed, 1 Oct 2014 17:15:54 +0200
Subject: [PATCH] <chromium> Fix conflicting types for 64 bit Windows Desktop
GL.
Fixes the redefinition of pointer types to appropriate values
on 64 Bit Windows.
Change-Id: Ia1735a5ae5c9dc12dab80e7670dea8270ebf089f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
chromium/gpu/command_buffer/common/gles2_cmd_format.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
index e8051b46899..69987030e6b 100644
--- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
@@ -39,8 +39,14 @@ typedef float GLclampf;
typedef double GLdouble;
typedef double GLclampd;
typedef void GLvoid;
+
+#ifdef _WIN64
+typedef signed long long int GLintptr;
+typedef signed long long int GLsizeiptr;
+#else
typedef khronos_intptr_t GLintptr;
typedef khronos_ssize_t GLsizeiptr;
+#endif
namespace gpu {
namespace gles2 {
--
GitLab