diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 07:48:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 07:48:42 -0700 |
| commit | 838336fa61f2f06898322f059570708def823398 (patch) | |
| tree | 6f662d08e86c00041da53bd795c1bcaedfebcedd | |
| parent | 933dc05929fba064286bd43a7c72c7d4e1775582 (diff) | |
| parent | 5dfd90e5c79774d9981d25ab4defbd1e1f652c34 (diff) | |
| download | system_core-838336fa61f2f06898322f059570708def823398.zip system_core-838336fa61f2f06898322f059570708def823398.tar.gz system_core-838336fa61f2f06898322f059570708def823398.tar.bz2 | |
am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp
* commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34':
pixelflinger: Fix function naming typo: gglBitBlti
| -rw-r--r-- | include/pixelflinger/pixelflinger.h | 2 | ||||
| -rw-r--r-- | libpixelflinger/raster.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/pixelflinger/pixelflinger.h b/include/pixelflinger/pixelflinger.h index dca0b90..8a2b442 100644 --- a/include/pixelflinger/pixelflinger.h +++ b/include/pixelflinger/pixelflinger.h @@ -315,7 +315,7 @@ extern "C" { ssize_t gglInit(GGLContext** context); ssize_t gglUninit(GGLContext* context); -GGLint gglBitBlti( +GGLint gglBitBlit( GGLContext* c, int tmu, GGLint crop[4], diff --git a/libpixelflinger/raster.cpp b/libpixelflinger/raster.cpp index d751202..32b2a97 100644 --- a/libpixelflinger/raster.cpp +++ b/libpixelflinger/raster.cpp @@ -143,7 +143,7 @@ void ggl_copyPixels(void* con, GGLint xs, GGLint ys, using namespace android; -GGLint gglBitBlti(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4]) +GGLint gglBitBlit(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4]) { GGL_CONTEXT(c, (void*)con); |