commit 5dfd90e5c79774d9981d25ab4defbd1e1f652c34
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 16 09:33:04 2010 -0700
committer Android Code Review <code-review@android.com> Mon Aug 16 09:33:04 2010 -0700
tree 023f3630e503c7047eb53c1ed9e53f5a7e232726
parent 4ea1a52b1bbbd6e78c5909c75d773416108f5b84
parent 6e1a9430e8e8de13109f1b234d937541a45a8ac5

Merge "pixelflinger: Fix function naming typo: gglBitBlti"

include/pixelflinger/pixelflinger.h

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 @@
 ssize_t gglInit(GGLContext** context);
 ssize_t gglUninit(GGLContext* context);
 
-GGLint gglBitBlti(
+GGLint gglBitBlit(
         GGLContext* c,
         int tmu,
         GGLint crop[4],

libpixelflinger/raster.cpp

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 @@
 
 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);