summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* move opengl/include/EGL/android_natives.h to ↵Mathias Agopian2009-05-056-245/+9
| | | | | | include/ui/egl/android_natives.h and don't include it from egl.h the android_native_ types are just forward declared in egl.h
* get rid of android_native_buffer_t::getHandle() and replace it with an ↵Mathias Agopian2009-05-053-34/+15
| | | | | | handle field this abstraction was not necessary. things are easier now.
* removed the "bits" attribute from android_native_buffer_t.Mathias Agopian2009-05-053-34/+57
| | | | "bits" can never be trusted now that we need to call lock() on the handle to get the virtual address of the buffer.
* update surfaceflinger, libui and libagl to the new gralloc apiMathias Agopian2009-05-048-118/+166
| | | | | | | | | | | | | | - Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually. - factor all the lock/unlock code in SurfaceBuffer. - fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers(). - improved the situation with the dirty-region and fixed a problem that caused GL apps to not update. - make use of LightRefBase() where needed, instead of duplicating its implementation - add LightRefBase::getStrongCount() - renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp - disabled copybits test, since it clashes with the new gralloc api - Camera/Video will be fixed later when we rework the overlay apis
* Merge commit 'goog/master' into merge_masterMathias Agopian2009-04-3015-2019/+917
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: libs/surfaceflinger/Layer.cpp libs/surfaceflinger/SurfaceFlinger.cpp opengl/libagl/egl.cpp opengl/libs/EGL/egl.cpp opengl/libs/GLES_CM/gl.cpp opengl/libs/GLES_CM/gl_api.in opengl/libs/gl_entries.in opengl/libs/tools/glapigen
| * oops forgot to remove a LOGD when loading an opengl driverMathias Agopian2009-04-241-1/+1
| |
| * Merge change 551 into donutAndroid (Google) Code Review2009-04-243-97/+2
| |\ | | | | | | | | | | | | * changes: Enable static Java APIs for OpenGL ES 1.1 extensions.
| | * Enable static Java APIs for OpenGL ES 1.1 extensions.Jack Palevich2009-04-243-97/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs up to. Now there are C APIs, so we can call them. Of course, whether or not the C APIs actually work when you call them depend upon the capabilities of the active OpenGL driver, which must be checked at run time. Also, while we're here, make the glGetString method static. It was always supposed to be static, but was accidentally implemented as non-static, because the code was copied from the non-static OpenGL ES classes.
| * | Make sure to map undefined OES functions to their non-OES counterpart if it ↵Mathias Agopian2009-04-231-3/+27
| |/ | | | | | | exists.
| * use gl.h to generate the *.in files. we are now supporting the full gl.h and ↵Mathias Agopian2009-04-2311-861/+877
| | | | | | | | glext.h apis.
| * integrate some OpenGL ES changes back from master_gl in preparation of ↵Mathias Agopian2009-04-2310-1516/+788
| | | | | | | | opening GLES to the NDK.
| * Add an Android-specific static OpenGL ES 1.1 Java API.Jack Palevich2009-04-1645-122/+1773
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds four new public classes that expose a static OpenGL ES 1.1 API: android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext Benefits: + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API. + The static API is similar to the C API, which should make it easier to import C-based example code. + The static API provides a clear path for adding new OpenGL ES 1.1 extensions and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard. Example: import static android.opengl.GLES10.*; ... glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Note that it is possible to mix-and-match calls to both the static and JSR239 APIs. This works because neither API maintains state. They both call through to the same underlying C OpenGL ES APIs. Implementation details: This change enhances the "glgen" "gen" script to generate both the original JSR239 and new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before, so there is no need to check in new versions of the generated JSR239 classes. As part of this work the gen script was updated to be somewhat more robust, and to work with git instead of perforce. The script prints out commands to git add the generated files, but leaves it up to the script runner to actually execute those commands.
| * Improve glgenJack Palevich2009-04-144-283/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + gen script is really a bash script rather than a sh script, so declare that to be true. (For example, it uses pushd, which is a part of bash, but not a part of sh. Not sure how this worked until now. Possibly gen was only run in environments where /bin/sh was really bash. + Check the results of the java compile of the code generator, and abort the script if the compile fails. + Turn on the bash shell option that guards against using uninitialized variables in the script. + Remove the generated class files. Refactor JniCodeEmitter into two classes: a general-purpose JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is to use JniCodeEmitter as a base for emitting static OpenGL ES bindings.
| * Clean up trivial Eclipse warnings and fix whitespace.Jack Palevich2009-04-138-744/+753
| | | | | | | | | | | | | | | | | | Added @Override to overridden methods. Removed unused imports. Converted tabs to spaces. Removed \r characters from end-of-lines. Add .gitignore file to ignore the .class files that are generated when the "gen" script is run.
| * AI 144282: Tweak this tool to work with the current directory structure.Jack Palevich2009-04-021-3/+14
| | | | | | | | | | | | | | Also leave the "generated" directory around if it contains files that need to be checked in. Automated import of CL 144282
| * Automated import from //branches/donutburger/...@142484,142484Jack Palevich2009-03-242-21/+38
| |
* | Merge commit 'goog/master' into merge_masterMathias Agopian2009-04-1749-1090/+2751
|\ \
| * | Manually merge 129, 174, and 233 from donutJack Palevich2009-04-1749-1090/+2751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a static OpenGL ES API. Here are the three commit messages for the original changes: Clean up trivial Eclipse warnings and fix whitespace. Added @Override to overridden methods. Removed unused imports. Converted tabs to spaces. Removed \r characters from end-of-lines. Add .gitignore file to ignore the .class files that are generated when the "gen" script is run. This is the 2nd commit message: Improve glgen + gen script is really a bash script rather than a sh script, so declare that to be true. (For example, it uses pushd, which is a part of bash, but not a part of sh. Not sure how this worked until now. Possibly gen was only run in environments where /bin/sh was really bash. + Check the results of the java compile of the code generator, and abort the script if the compile fails. + Turn on the bash shell option that guards against using uninitialized variables in the script. + Remove the generated class files. Refactor JniCodeEmitter into two classes: a general-purpose JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is to use JniCodeEmitter as a base for emitting static OpenGL ES bindings. This is the 3rd commit message: Add an Android-specific static OpenGL ES 1.1 Java API. This change adds four new public classes that expose a static OpenGL ES 1.1 API: android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext Benefits: + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API. + The static API is similar to the C API, which should make it easier to import C-based example code. + The static API provides a clear path for adding new OpenGL ES 1.1 extensions and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard. Example: import static android.opengl.GLES10.*; ... glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Note that it is possible to mix-and-match calls to both the static and JSR239 APIs. This works because neither API maintains state. They both call through to the same underlying C OpenGL ES APIs. Implementation details: This change enhances the "glgen" "gen" script to generate both the original JSR239 and new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before, so there is no need to check in new versions of the generated JSR239 classes. As part of this work the gen script was updated to be somewhat more robust, and to work with git instead of perforce. The script prints out commands to git add the generated files, but leaves it up to the script runner to actually execute those commands.
* | | Add clarifying comment.Jack Palevich2009-04-131-1/+1
| | | | | | | | | | | | (Primarily as a test of the master_gl branch.)
* | | more debugging tools around BufferMapperMathias Agopian2009-04-101-4/+9
| | |
* | | Integrate from //sandbox/mathias/donut/...@145728Mathias Agopian2009-04-1023-761/+3027
|/ / | | | | | | SurfaceFlinger rework for new EGL driver model support.
* | AI 144401: am: CL 144282 Tweak this tool to work with the current directory ↵Jack Palevich2009-04-021-3/+14
| | | | | | | | | | | | | | | | | | | | structure. Also leave the "generated" directory around if it contains files that need to be checked in. Original author: jackpal Automated import of CL 144401
* | Automated import from //branches/master/...@142578,142578Jack Palevich2009-03-252-21/+38
|/
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03107-0/+24650
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03107-24648/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-032-8/+6
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-022-6/+8
|
* auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-191-7/+1
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-1040-1141/+3219
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-153-2/+10
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1765-133/+7408
|
* Initial ContributionThe Android Open Source Project2008-10-2141-0/+15293