diff options
| author | Jack Palevich <jackpal@google.com> | 2009-09-23 15:03:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 15:03:46 -0700 |
| commit | b09c63e24043a6ca03f04709a92f528d233fd8d7 (patch) | |
| tree | f7d941d8545d7ad20b4bee7a4b1876af479186ce /opengl/java/android | |
| parent | 5ddbc0d59d8143d50a19950624c38fdb8102156b (diff) | |
| parent | 311ed0191d6423e41b1cf5137a38e53504494818 (diff) | |
| download | frameworks_base-b09c63e24043a6ca03f04709a92f528d233fd8d7.zip frameworks_base-b09c63e24043a6ca03f04709a92f528d233fd8d7.tar.gz frameworks_base-b09c63e24043a6ca03f04709a92f528d233fd8d7.tar.bz2 | |
am 311ed019: Merge change 26679 into eclair
Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp
* commit '311ed0191d6423e41b1cf5137a38e53504494818':
Create samples showing how to call OpenGL from JNI libraries.
Diffstat (limited to 'opengl/java/android')
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index b3a19e3..4599b77 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -296,7 +296,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * a context will be created with no shared context and * with a null attribute list. */ - public void setContextFactory(EGLContextFactory factory) { + public void setEGLContextFactory(EGLContextFactory factory) { checkRenderThreadState(); mEGLContextFactory = factory; } @@ -311,7 +311,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * If this method is not called, then by default * a window surface will be created with a null attribute list. */ - public void setWindowSurfaceFactory(EGLWindowSurfaceFactory factory) { + public void setEGLWindowSurfaceFactory(EGLWindowSurfaceFactory factory) { checkRenderThreadState(); mEGLWindowSurfaceFactory = factory; } |