Mathias Agopian
|
7be3e5d2d8
|
Merge commit 'goog/master' into merge_master
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
|
2009-04-30 14:43:18 -07:00 |
|
Mathias Agopian
|
b519abb606
|
use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
|
2009-04-23 18:05:44 -07:00 |
|
Mathias Agopian
|
53238bddea
|
integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
|
2009-04-23 13:45:48 -07:00 |
|
Mathias Agopian
|
076b1cc3a9
|
Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
|
2009-04-10 14:24:30 -07:00 |
|
The Android Open Source Project
|
edbf3b6af7
|
auto import from //depot/cupcake/@135843
|
2009-03-03 19:31:44 -08:00 |
|
The Android Open Source Project
|
d5193d9394
|
auto import from //depot/cupcake/@135843
|
2009-03-03 18:28:45 -08:00 |
|
The Android Open Source Project
|
a6938bab1f
|
auto import from //branches/cupcake/...@130745
|
2009-02-10 15:44:00 -08:00 |
|