提交 8c5fa431 编写于 作者: D dxu

8011602: jobjc build failure on Mac

Summary: Remove @Native annotation from macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java
Reviewed-by: mchung, dholmes
上级 8e3ba71c
......@@ -35,26 +35,25 @@ import com.apple.jobjc.PrimitiveCoder.SCharCoder;
import com.apple.jobjc.PrimitiveCoder.SIntCoder;
import com.apple.jobjc.PrimitiveCoder.SLongLongCoder;
import com.apple.jobjc.PrimitiveCoder.SShortCoder;
import java.lang.annotation.Native;
public abstract class Coder<T> {
private static native long getNativeFFITypePtrForCode(final int code);
@Native static final int FFI_VOID = 0;
@Native static final int FFI_PTR = FFI_VOID+1;
@Native static final int FFI_SINT8 = FFI_PTR+1;
@Native static final int FFI_UINT8 = FFI_SINT8+1;
@Native static final int FFI_SINT16 = FFI_UINT8+1;
@Native static final int FFI_UINT16 = FFI_SINT16+1;
@Native static final int FFI_SINT32 = FFI_UINT16+1;
@Native static final int FFI_UINT32 = FFI_SINT32+1;
@Native static final int FFI_SINT64 = FFI_UINT32+1;
@Native static final int FFI_UINT64 = FFI_SINT64+1;
@Native static final int FFI_FLOAT = FFI_UINT64+1;
@Native static final int FFI_DOUBLE = FFI_FLOAT+1;
@Native static final int FFI_LONGDOUBLE = FFI_DOUBLE+1;
static final int FFI_VOID = 0;
static final int FFI_PTR = FFI_VOID+1;
static final int FFI_SINT8 = FFI_PTR+1;
static final int FFI_UINT8 = FFI_SINT8+1;
static final int FFI_SINT16 = FFI_UINT8+1;
static final int FFI_UINT16 = FFI_SINT16+1;
static final int FFI_SINT32 = FFI_UINT16+1;
static final int FFI_UINT32 = FFI_SINT32+1;
static final int FFI_SINT64 = FFI_UINT32+1;
static final int FFI_UINT64 = FFI_SINT64+1;
static final int FFI_FLOAT = FFI_UINT64+1;
static final int FFI_DOUBLE = FFI_FLOAT+1;
static final int FFI_LONGDOUBLE = FFI_DOUBLE+1;
private static long[] ffiCodesToFFITypePtrs;
static{
......
......@@ -161,32 +161,39 @@ public class OGLContext extends BufferedContext {
* This cap will only be set if the fbobject system property has been
* enabled and we are able to create an FBO with depth buffer.
*/
@Native static final int CAPS_EXT_FBOBJECT =
@Native
static final int CAPS_EXT_FBOBJECT =
(CAPS_RT_TEXTURE_ALPHA | CAPS_RT_TEXTURE_OPAQUE);
/** Indicates that the context supports a stored alpha channel. */
@Native static final int CAPS_STORED_ALPHA = CAPS_RT_PLAIN_ALPHA;
@Native
static final int CAPS_STORED_ALPHA = CAPS_RT_PLAIN_ALPHA;
/** Indicates that the context is doublebuffered. */
@Native static final int CAPS_DOUBLEBUFFERED = (FIRST_PRIVATE_CAP << 0);
@Native
static final int CAPS_DOUBLEBUFFERED = (FIRST_PRIVATE_CAP << 0);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the lcdshader system property has been
* enabled and the hardware supports the minimum number of texture units
*/
@Native static final int CAPS_EXT_LCD_SHADER = (FIRST_PRIVATE_CAP << 1);
@Native
static final int CAPS_EXT_LCD_SHADER = (FIRST_PRIVATE_CAP << 1);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the biopshader system property has been
* enabled and the hardware meets our minimum requirements.
*/
@Native static final int CAPS_EXT_BIOP_SHADER = (FIRST_PRIVATE_CAP << 2);
@Native
static final int CAPS_EXT_BIOP_SHADER = (FIRST_PRIVATE_CAP << 2);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the gradshader system property has been
* enabled and the hardware meets our minimum requirements.
*/
@Native static final int CAPS_EXT_GRAD_SHADER = (FIRST_PRIVATE_CAP << 3);
@Native
static final int CAPS_EXT_GRAD_SHADER = (FIRST_PRIVATE_CAP << 3);
/** Indicates the presence of the GL_ARB_texture_rectangle extension. */
@Native static final int CAPS_EXT_TEXRECT = (FIRST_PRIVATE_CAP << 4);
@Native
static final int CAPS_EXT_TEXRECT = (FIRST_PRIVATE_CAP << 4);
OGLContextCaps(int caps, String adapterId) {
super(caps, adapterId);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册