Merged with main trunk (tag JOGL_PRE_1_1_1)

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@317 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 6 insertions, 2 deletions

diff --git a/make/stub_includes/macosx/window-system.c b/make/stub_includes/macosx/window-system.c
index b30c252f3..e53300830 100644
--- a/make/stub_includes/macosx/window-system.c
+++ b/make/stub_includes/macosx/window-system.c
@@ -5,6 +5,7 @@ typedef int Bool;
 
 void* createContext(void* shareContext, void* nsView,
                     int doubleBuffer,
+                    int stereo,
                     int redBits,
                     int greenBits,
                     int blueBits,
@@ -16,7 +17,10 @@ void* createContext(void* shareContext, void* nsView,
                     int accumBlueBits,
                     int accumAlphaBits,
                     int sampleBuffers,
-                    int numSamples);
+                    int numSamples,
+                    int pbuffer,
+                    int floatingPoint,
+                    int* viewNotReady);
 Bool  makeCurrentContext(void* nsContext, void* nsView);
 Bool  clearCurrentContext(void* nsContext, void* nsView);
 Bool  deleteContext(void* nsContext, void* nsView);
@@ -26,7 +30,7 @@ void  updateContext(void* nsContext, void* nsView);
 void* updateContextRegister(void* nsContext, void* nsView);
 void  updateContextUnregister(void* nsContext, void* nsView, void* updater);
 
-void* createPBuffer(int renderTarget, int width, int height);
+void* createPBuffer(int renderTarget, int internalFormat, int width, int height);
 Bool destroyPBuffer(void* nsContext, void* pBuffer);
 void setContextPBuffer(void* nsContext, void* pBuffer);
 void setContextTextureImageToPBuffer(void* nsContext, void* pBuffer, int colorBuffer);