2
0
mirror of synced 2025-02-22 14:28:14 +00:00

gl: darwin/arm64 support

Conflicts with cl/10396. I'll submit this first and update the it.

Change-Id: Ibc873b3fe896ecd2415a42676614807788a8d1c6
Reviewed-on: https://go-review.googlesource.com/10399
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
David Crawshaw 2015-05-26 10:20:10 -04:00
parent 730f563fbc
commit d2634ce9c5
5 changed files with 8 additions and 6 deletions

View File

@ -232,7 +232,7 @@ package gl
#ifdef os_linux
#include <GLES2/gl2.h>
#endif
#ifdef os_darwin_arm
#ifdef os_ios
#include <OpenGLES/ES2/gl.h>
#endif
#ifdef os_darwin_amd64

View File

@ -20,7 +20,7 @@ package gl
#ifdef os_linux
#include <GLES2/gl2.h>
#endif
#ifdef os_darwin_arm
#ifdef os_ios
#include <OpenGLES/ES2/glext.h>
#endif
#ifdef os_darwin_amd64

View File

@ -16,7 +16,7 @@ package gl
#ifdef os_linux
#include <GLES2/gl2.h>
#endif
#ifdef os_darwin_arm
#ifdef os_ios
#include <OpenGLES/ES2/gl.h>
#endif
#ifdef os_darwin_amd64

View File

@ -12,16 +12,18 @@ package gl
/*
#cgo darwin,amd64 LDFLAGS: -framework OpenGL
#cgo darwin,arm LDFLAGS: -framework OpenGLES
#cgo darwin,arm64 LDFLAGS: -framework OpenGLES
#cgo linux LDFLAGS: -lGLESv2
#cgo darwin,amd64 CFLAGS: -Dos_darwin_amd64
#cgo darwin,arm CFLAGS: -Dos_darwin_arm
#cgo darwin,arm CFLAGS: -Dos_ios
#cgo darwin,arm64 CFLAGS: -Dos_ios
#cgo linux CFLAGS: -Dos_linux
#ifdef os_linux
#include <GLES2/gl2.h>
#endif
#ifdef os_darwin_arm
#ifdef os_ios
#include <OpenGLES/ES2/gl.h>
#endif
#ifdef os_darwin_amd64

View File

@ -11,7 +11,7 @@ package gl
#ifdef os_linux
#include <GLES2/gl2.h>
#endif
#ifdef os_darwin_arm
#ifdef os_ios
#include <OpenGLES/ES2/gl.h>
#endif
#ifdef os_darwin_amd64