|
 |
e797f0b |
diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
|
|
|
e797f0b |
--- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000
|
|
|
e797f0b |
+++ openjdk-boot/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000
|
|
|
e797f0b |
@@ -303,7 +303,11 @@
|
|
|
e797f0b |
$(prep-target)
|
|
|
e797f0b |
@$(ECHO) "# Running javah:"
|
|
|
e797f0b |
$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
|
|
|
e797f0b |
- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
|
|
|
e797f0b |
+ $(CLASSES.export)
|
|
|
e797f0b |
+ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \
|
|
|
e797f0b |
+ $(JAVAH_CMD) \
|
|
|
e797f0b |
+ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \
|
|
|
e797f0b |
+ $(innerclass))
|
|
|
e797f0b |
@$(java-vm-cleanup)
|
|
|
e797f0b |
@$(TOUCH) $@
|
|
|
e797f0b |
|
|
|
e797f0b |
diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
|
|
|
e797f0b |
--- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000
|
|
|
e797f0b |
+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000
|
|
|
e797f0b |
@@ -189,3 +189,5 @@
|
|
|
e797f0b |
java/awt/dnd/DnDConstants.java \
|
|
|
e797f0b |
sun/awt/CausedFocusEvent.java
|
|
|
e797f0b |
|
|
|
e797f0b |
+EXPORTED_inner = \
|
|
|
e797f0b |
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
|
|
|
e797f0b |
diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
|
|
|
e797f0b |
--- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000
|
|
|
e797f0b |
+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000
|
|
|
e797f0b |
@@ -27,6 +27,7 @@
|
|
|
e797f0b |
#define OGLContext_h_Included
|
|
|
e797f0b |
|
|
|
e797f0b |
#include "sun_java2d_pipe_BufferedContext.h"
|
|
|
e797f0b |
+#include "sun_java2d_pipe_hw_ContextCapabilities.h"
|
|
|
e797f0b |
#include "sun_java2d_opengl_OGLContext.h"
|
|
|
e797f0b |
#include "sun_java2d_opengl_OGLContext_OGLContextCaps.h"
|
|
|
e797f0b |
|
|
|
e797f0b |
@@ -100,39 +101,39 @@
|
|
|
e797f0b |
* See OGLContext.java for more on these flags.
|
|
|
e797f0b |
*/
|
|
|
e797f0b |
#define CAPS_EMPTY \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY
|
|
|
e797f0b |
#define CAPS_RT_PLAIN_ALPHA \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA
|
|
|
e797f0b |
#define CAPS_RT_TEXTURE_ALPHA \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA
|
|
|
e797f0b |
#define CAPS_RT_TEXTURE_OPAQUE \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE
|
|
|
e797f0b |
#define CAPS_MULTITEXTURE \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE
|
|
|
e797f0b |
#define CAPS_TEXNONPOW2 \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2
|
|
|
e797f0b |
#define CAPS_TEXNONSQUARE \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE
|
|
|
e797f0b |
#define CAPS_PS20 \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20
|
|
|
e797f0b |
#define CAPS_PS30 \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30
|
|
|
e797f0b |
+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30
|
|
|
e797f0b |
#define LAST_SHARED_CAP \
|
|
|
e797f0b |
sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP
|
|
|
e797f0b |
#define CAPS_EXT_FBOBJECT \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT
|
|
|
e797f0b |
#define CAPS_STORED_ALPHA \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA
|
|
|
e797f0b |
#define CAPS_DOUBLEBUFFERED \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED
|
|
|
e797f0b |
#define CAPS_EXT_LCD_SHADER \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER
|
|
|
e797f0b |
#define CAPS_EXT_BIOP_SHADER \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER
|
|
|
e797f0b |
#define CAPS_EXT_GRAD_SHADER \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER
|
|
|
e797f0b |
#define CAPS_EXT_TEXRECT \
|
|
|
e797f0b |
- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT
|
|
|
e797f0b |
+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT
|
|
|
e797f0b |
|
|
|
e797f0b |
/**
|
|
|
e797f0b |
* Evaluates to true if the given capability bitmask is present for the
|