diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-16 09:33:04 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-08-16 09:33:04 -0700 |
| commit | 5dfd90e5c79774d9981d25ab4defbd1e1f652c34 (patch) | |
| tree | 023f3630e503c7047eb53c1ed9e53f5a7e232726 | |
| parent | 4ea1a52b1bbbd6e78c5909c75d773416108f5b84 (diff) | |
| parent | 6e1a9430e8e8de13109f1b234d937541a45a8ac5 (diff) | |
| download | system_core-5dfd90e5c79774d9981d25ab4defbd1e1f652c34.tar.gz system_core-5dfd90e5c79774d9981d25ab4defbd1e1f652c34.tar.bz2 system_core-5dfd90e5c79774d9981d25ab4defbd1e1f652c34.zip | |
Merge "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 dca0b907..8a2b4421 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 d7512029..32b2a97a 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); |