hg: macosx-port/macosx-port/jdk: Enable the CA Layer branch to use an IOSurface backed texture.

[Phil Race]

Hmm. I don't have 10.7 .. but I can't imagine why that would matter.
And I didn't add those calls anyway, they already there in Dmitry's push.
Did this build for you previously ?
There is an issue that the JDK includes gl.h and glext.h header files
and whilst the former may be interchangeable with Apple's the latter isn't.
I had to make sure I didn't get both but it sounds like you got neither ...
So maybe #import <OpenGL/OpenGL.h> will fix it but I don't immediately
see why it should be needed now but not before

-phil.

On 9/8/11 6:10 PM, Mike Swingler wrote:
> On Sep 8, 2011, at 4:36 PM, philip.race at oracle.com wrote:
>
>> Changeset: 5ee699f1b737
>> Author:    prr
>> Date:      2011-09-08 16:14 -0700
>> URL:       http://hg.openjdk.java.net/macosx-port/macosx-port/jdk/rev/5ee699f1b737
>>
>> Enable the CA Layer branch to use an IOSurface backed texture.
>>
>> ! make/sun/lwawt/Makefile
>> ! src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.h
>> ! src/macosx/native/sun/java2d/opengl/CGLLayer.h
>> ! src/macosx/native/sun/java2d/opengl/CGLLayer.m
>> ! src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h
>> ! src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m
>> ! src/share/native/sun/java2d/opengl/OGLSurfaceData.h
> Hey Phil, I tried to build this on 10.7 and I'm getting:
>
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m: In function ‘-[CGLLayer _blitTexture]’:
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:73: warning: implicit declaration of function ‘glEnable’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:74: warning: implicit declaration of function ‘glBindTexture’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: warning: implicit declaration of function ‘glTexEnvf’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: error: ‘GL_TEXTURE_ENV’ undeclared (first use in this function)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: error: (Each undeclared identifier is reported only once
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: error: for each function it appears in.)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: error: ‘GL_TEXTURE_ENV_MODE’ undeclared (first use in this function)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:76: error: ‘GL_REPLACE’ undeclared (first use in this function)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:79: error: ‘GL_TEXTURE_RECTANGLE_ARB’ undeclared (first use in this function)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:83: warning: implicit declaration of function ‘glBegin’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:83: error: ‘GL_QUADS’ undeclared (first use in this function)
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:84: warning: implicit declaration of function ‘glTexCoord2f’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:84: warning: implicit declaration of function ‘glVertex2f’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:88: warning: implicit declaration of function ‘glEnd’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:91: warning: implicit declaration of function ‘glDisable’
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m: In function ‘-[CGLLayer drawInCGLContext:pixelFormat:forLayerTime:displayTime:]’:
> /Volumes/local_data/src/projects/macosx-port-calayer/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m:101: warning: implicit declaration of function ‘glViewport’
> lipo: can't figure out the architecture type of: /var/folders/4p/_xxgvhrj5c533hpmlz9hx3s40006k0/T//cczRwf9W.out
> make[5]: *** [/Volumes/local_data/src/projects/macosx-port-calayer/build/macosx-universal/tmp/sun/sun.lwawt/lwawt/obj/CGLLayer.o] Error 1
> make[5]: *** Waiting for unfinished jobs....
>
> Do you think there might be an umbrella header you aren't pulling in correctly somewhere?
>
> Regards,
> Mike Swingler
> Java Engineering
> Apple Inc.
>