--- old/modules/graphics/src/main/java/com/sun/prism/es2/IOSGLFactory.java	2015-01-09 14:57:22.000000000 -0800
+++ new/modules/graphics/src/main/java/com/sun/prism/es2/IOSGLFactory.java	2015-01-09 14:57:22.000000000 -0800
@@ -58,7 +58,15 @@
     @Override
     GLContext createGLContext(GLDrawable drawable, GLPixelFormat pixelFormat,
         GLContext shareCtx, boolean vSyncRequest) {
-        return new IOSGLContext(drawable, pixelFormat, shareCtx, vSyncRequest);
+        GLContext prismCtx = new IOSGLContext(drawable, pixelFormat, shareCtx, vSyncRequest);
+
+        // JIRA: RT-21739
+        // TODO: This is a temporary mechanism to work well with Glass on Mac due
+        // to the CALayer work. Need to be removed in the early future for 3.0
+        HashMap devDetails = (HashMap) ES2Pipeline.getInstance().getDeviceDetails();
+        updateDeviceDetails(devDetails, prismCtx);
+
+        return prismCtx;
     }
 
     @Override
@@ -122,8 +130,7 @@
     // JIRA: RT-21739
     // This is a temporary mechanism to work well with Glass on iOS due
     // to the CALayer work. Need to be removed in the early future for 3.0
-    @Override
-    void updateDeviceDetails(HashMap deviceDetails, GLContext glContext) {
+    private void updateDeviceDetails(HashMap deviceDetails, GLContext glContext) {
         deviceDetails.put("contextPtr", glContext.getNativeHandle());
     }
 }