Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: gpu/gles2_conform_support/egl/egl.cc

Issue 1260253003: gpu: Add calling convention for win32 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another merge Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_lib.h ('k') | mojo/gles2/gles2_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gles2_conform_support/egl/egl.cc
diff --git a/gpu/gles2_conform_support/egl/egl.cc b/gpu/gles2_conform_support/egl/egl.cc
index f23cf76e994b719fe4c6bf7809cc7c349db4770e..b777f236f5d4e9e9bfdf39e68ff69eb756dddfdc 100644
--- a/gpu/gles2_conform_support/egl/egl.cc
+++ b/gpu/gles2_conform_support/egl/egl.cc
@@ -399,6 +399,7 @@ EGLBoolean eglCopyBuffers(EGLDisplay dpy,
/* Now, define eglGetProcAddress using the generic function ptr. type */
__eglMustCastToProperFunctionPointerType
eglGetProcAddress(const char* procname) {
- return gles2::GetGLFunctionPointer(procname);
+ return reinterpret_cast<__eglMustCastToProperFunctionPointerType>(
+ gles2::GetGLFunctionPointer(procname));
}
} // extern "C"
« no previous file with comments | « gpu/command_buffer/client/gles2_lib.h ('k') | mojo/gles2/gles2_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698